Merge branch 'bpf'

Browse source

Alexei Starovoitov says:

====================
bpf: fix two bugs

Michael Holzheu caught two issues (in bpf syscall and in the test).
Fix them. Details in corresponding patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-01-26 17:20:48 -08:00

parent 600ddd6825 ba1a68bf13

commit 412d2907c4

2 changed files with 19 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

kernel/bpf/syscall.c

View file

4

samples/bpf/test_maps.c

View file