Commit 7c0f488f authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ia64 kcmp syscall from Tony Luck:
 "Missed adding the kcmp() syscall a long time ago.  Now it seems that
  it is essential to build systemd"

* tag 'please-pull-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Wire up kcmp syscall
parents 8a28d674 d305c477
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define NR_syscalls 321 /* length of syscall table */ #define NR_syscalls 322 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about
......
...@@ -334,5 +334,6 @@ ...@@ -334,5 +334,6 @@
#define __NR_execveat 1342 #define __NR_execveat 1342
#define __NR_userfaultfd 1343 #define __NR_userfaultfd 1343
#define __NR_membarrier 1344 #define __NR_membarrier 1344
#define __NR_kcmp 1345
#endif /* _UAPI_ASM_IA64_UNISTD_H */ #endif /* _UAPI_ASM_IA64_UNISTD_H */
...@@ -1770,5 +1770,6 @@ sys_call_table: ...@@ -1770,5 +1770,6 @@ sys_call_table:
data8 sys_execveat data8 sys_execveat
data8 sys_userfaultfd data8 sys_userfaultfd
data8 sys_membarrier data8 sys_membarrier
data8 sys_kcmp // 1345
.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
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