diff options
| author | Linus Torvalds | 2014-10-14 03:50:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-10-14 03:50:34 +0200 |
| commit | fc2414b4b4569fab5404c6f49f36bae0dfa3d936 (patch) | |
| tree | b8f096372d1ebfb5e0050048de020cbe8ab78789 /arch/ia64/kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml (diff) | |
| parent | [IA64] Enable bpf syscall for ia64 (diff) | |
| download | kernel-qcow2-linux-fc2414b4b4569fab5404c6f49f36bae0dfa3d936.tar.gz kernel-qcow2-linux-fc2414b4b4569fab5404c6f49f36bae0dfa3d936.tar.xz kernel-qcow2-linux-fc2414b4b4569fab5404c6f49f36bae0dfa3d936.zip | |
Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Wire up bpf syscall for ia64"
* tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Enable bpf syscall for ia64
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 01edf242eb29..f5e96dffc63c 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1778,6 +1778,7 @@ sys_call_table: data8 sys_renameat2 data8 sys_getrandom data8 sys_memfd_create // 1340 + data8 sys_bpf .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |