diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 21:50:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 21:50:34 -0400 |
| commit | fc2414b4b4569fab5404c6f49f36bae0dfa3d936 (patch) | |
| tree | b8f096372d1ebfb5e0050048de020cbe8ab78789 /arch/ia64/kernel | |
| parent | 31003e3a9df675f1ac85d7bcf8e5a5d622576375 (diff) | |
| parent | 5dab4b73c736c2cb8e35148f9ee2365ee48bad79 (diff) | |
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: | |||
| 1778 | data8 sys_renameat2 | 1778 | data8 sys_renameat2 |
| 1779 | data8 sys_getrandom | 1779 | data8 sys_getrandom |
| 1780 | data8 sys_memfd_create // 1340 | 1780 | data8 sys_memfd_create // 1340 |
| 1781 | data8 sys_bpf | ||
| 1781 | 1782 | ||
| 1782 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1783 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1783 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1784 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |