diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 03:50:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 03:50:34 +0200 |
| commit | fc2414b4b4569fab5404c6f49f36bae0dfa3d936 (patch) | |
| tree | b8f096372d1ebfb5e0050048de020cbe8ab78789 /arch/ia64 | |
| parent | 31003e3a9df675f1ac85d7bcf8e5a5d622576375 (diff) | |
| parent | 5dab4b73c736c2cb8e35148f9ee2365ee48bad79 (diff) | |
| download | op-kernel-dev-fc2414b4b4569fab5404c6f49f36bae0dfa3d936.zip op-kernel-dev-fc2414b4b4569fab5404c6f49f36bae0dfa3d936.tar.gz | |
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')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 10a14ea..f3b51b5 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -11,7 +11,7 @@ -#define NR_syscalls 317 /* length of syscall table */ +#define NR_syscalls 318 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h index 18026b2..4c2240c 100644 --- a/arch/ia64/include/uapi/asm/unistd.h +++ b/arch/ia64/include/uapi/asm/unistd.h @@ -330,5 +330,6 @@ #define __NR_renameat2 1338 #define __NR_getrandom 1339 #define __NR_memfd_create 1340 +#define __NR_bpf 1341 #endif /* _UAPI_ASM_IA64_UNISTD_H */ diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 01edf24..f5e96df 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 */ |
