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
This commit is contained in:
Linus Torvalds
2014-10-14 03:50:34 +02:00
3 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -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 */