aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2015-09-15 16:50:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-15 19:22:45 -0400
commit865ca084fdc68cd9b658da4b098008278da8fed3 (patch)
tree03a2712123f6b9ec9971feadb9839a1532146f36
parent09a77a885233e2a20dac2635a79c83ccf50a26a1 (diff)
ia64: Enable userfaultfd and membarrier system calls
Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/ia64/include/asm/unistd.h2
-rw-r--r--arch/ia64/include/uapi/asm/unistd.h2
-rw-r--r--arch/ia64/kernel/entry.S2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 95c39b95e97e..99c96a5e6016 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -11,7 +11,7 @@
11 11
12 12
13 13
14#define NR_syscalls 319 /* length of syscall table */ 14#define NR_syscalls 321 /* length of syscall table */
15 15
16/* 16/*
17 * The following defines stop scripts/checksyscalls.sh from complaining about 17 * 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 461079560c78..98e94e19a5a0 100644
--- a/arch/ia64/include/uapi/asm/unistd.h
+++ b/arch/ia64/include/uapi/asm/unistd.h
@@ -332,5 +332,7 @@
332#define __NR_memfd_create 1340 332#define __NR_memfd_create 1340
333#define __NR_bpf 1341 333#define __NR_bpf 1341
334#define __NR_execveat 1342 334#define __NR_execveat 1342
335#define __NR_userfaultfd 1343
336#define __NR_membarrier 1344
335 337
336#endif /* _UAPI_ASM_IA64_UNISTD_H */ 338#endif /* _UAPI_ASM_IA64_UNISTD_H */
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index ae0de7bf5525..37cc7a65cd3e 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1768,5 +1768,7 @@ sys_call_table:
1768 data8 sys_memfd_create // 1340 1768 data8 sys_memfd_create // 1340
1769 data8 sys_bpf 1769 data8 sys_bpf
1770 data8 sys_execveat 1770 data8 sys_execveat
1771 data8 sys_userfaultfd
1772 data8 sys_membarrier
1771 1773
1772 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1774 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls