diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 14:09:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-03 14:09:33 -0800 |
| commit | f4ca536f71ad69d9a974d0156d43b24b3f3112de (patch) | |
| tree | 7361fc8dbcec4bdca9993890c06425f087fc5d7c /arch/m68k/kernel/syscalltable.S | |
| parent | 2084becbe168f6d10be51e08a2eedb804cf51198 (diff) | |
| parent | f7bbd12a4b7e088f53f20dd31019984459699fb9 (diff) | |
| download | op-kernel-dev-f4ca536f71ad69d9a974d0156d43b24b3f3112de.zip op-kernel-dev-f4ca536f71ad69d9a974d0156d43b24b3f3112de.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.
Just wiring up the bpf system call.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up bpf
Diffstat (limited to 'arch/m68k/kernel/syscalltable.S')
| -rw-r--r-- | arch/m68k/kernel/syscalltable.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index 05b46c2..2ca219e 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S @@ -374,4 +374,5 @@ ENTRY(sys_call_table) .long sys_renameat2 .long sys_getrandom .long sys_memfd_create + .long sys_bpf |
