Commit f40bde85 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'please-pull-syscall' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 fixlet from Tony Luck:
 "Add execveat syscall"

* tag 'please-pull-syscall' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable execveat syscall for ia64
parents 693a30b8 b739896d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define NR_syscalls 318 /* length of syscall table */ #define NR_syscalls 319 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about
......
...@@ -331,5 +331,6 @@ ...@@ -331,5 +331,6 @@
#define __NR_getrandom 1339 #define __NR_getrandom 1339
#define __NR_memfd_create 1340 #define __NR_memfd_create 1340
#define __NR_bpf 1341 #define __NR_bpf 1341
#define __NR_execveat 1342
#endif /* _UAPI_ASM_IA64_UNISTD_H */ #endif /* _UAPI_ASM_IA64_UNISTD_H */
...@@ -1779,6 +1779,7 @@ sys_call_table: ...@@ -1779,6 +1779,7 @@ sys_call_table:
data8 sys_getrandom data8 sys_getrandom
data8 sys_memfd_create // 1340 data8 sys_memfd_create // 1340
data8 sys_bpf data8 sys_bpf
data8 sys_execveat
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment