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
git-mirror · Oct 14, 2014 · fc2414b · fc2414b
2 parents 31003e3 + 5dab4b7
commit fc2414b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@