diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2015-09-07 19:15:56 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-09-17 14:43:44 +0300 |
| commit | 96d4ee8aaa3cfbfadf137904f3696a9a84fab2d3 (patch) | |
| tree | 4ef9fc160d414823b337642621fe96ba11ad8ea1 /arch | |
| parent | 3dc636b2dafbf05b86decc2a55989c3261ffd116 (diff) | |
| download | linux-96d4ee8aaa3cfbfadf137904f3696a9a84fab2d3.tar.xz | |
s390/s390x: allocate sys_membarrier system call number
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: linux-api@vger.kernel.org
CC: Heiko Carstens <heiko.carstens@de.ibm.com>
CC: linux-s390@vger.kernel.org
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/uapi/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/s390/kernel/syscalls.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h index 1f4acec63d05..ff74d4976a6d 100644 --- a/arch/s390/include/uapi/asm/unistd.h +++ b/arch/s390/include/uapi/asm/unistd.h @@ -291,7 +291,8 @@ #define __NR_s390_pci_mmio_read 353 #define __NR_execveat 354 #define __NR_userfaultfd 355 -#define NR_syscalls 356 +#define __NR_membarrier 356 +#define NR_syscalls 357 /* * There are some system calls that are not present on 64 bit, some diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 0c91f37f8065..e4167bb73d61 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S @@ -364,3 +364,4 @@ SYSCALL(sys_s390_pci_mmio_write,compat_sys_s390_pci_mmio_write) SYSCALL(sys_s390_pci_mmio_read,compat_sys_s390_pci_mmio_read) SYSCALL(sys_execveat,compat_sys_execveat) SYSCALL(sys_userfaultfd,sys_userfaultfd) /* 355 */ +SYSCALL(sys_membarrier,sys_membarrier) |