Commit 2475c362 authored by Michael Ellerman's avatar Michael Ellerman

Partial revert of "powerpc: Individual System V IPC system calls"

This partially reverts commit a3423615.

While reviewing the glibc patch to exploit the individual IPC calls,
Arnd & Andreas noticed that we were still requiring userspace to pass
IPC_64 in order to get the new style IPC API.

With a bit of cleanup in the kernel we can drop that requirement, and
instead only provide the new style API, which will simplify things for
userspace.

Rather than try and sneak that patch into 4.4, instead we will drop the
individual IPC calls for powerpc, and merge them again in 4.5 once the
cleanup patch has gone in.

Because we've already added sys_mlock2() as syscall #378, we don't do a
full revert of the IPC calls. Instead we drop the __NR #defines, and
send those now undefined syscall numbers to sys_ni_syscall(). This
leaves a gap in the syscall numbers, but we'll reuse them when we merge
the individual IPC calls.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent dc9c41bd
...@@ -370,16 +370,16 @@ COMPAT_SYS(execveat) ...@@ -370,16 +370,16 @@ COMPAT_SYS(execveat)
PPC64ONLY(switch_endian) PPC64ONLY(switch_endian)
SYSCALL_SPU(userfaultfd) SYSCALL_SPU(userfaultfd)
SYSCALL_SPU(membarrier) SYSCALL_SPU(membarrier)
SYSCALL(semop) SYSCALL(ni_syscall)
SYSCALL(semget) SYSCALL(ni_syscall)
COMPAT_SYS(semctl) SYSCALL(ni_syscall)
COMPAT_SYS(semtimedop) SYSCALL(ni_syscall)
COMPAT_SYS(msgsnd) SYSCALL(ni_syscall)
COMPAT_SYS(msgrcv) SYSCALL(ni_syscall)
SYSCALL(msgget) SYSCALL(ni_syscall)
COMPAT_SYS(msgctl) SYSCALL(ni_syscall)
COMPAT_SYS(shmat) SYSCALL(ni_syscall)
SYSCALL(shmdt) SYSCALL(ni_syscall)
SYSCALL(shmget) SYSCALL(ni_syscall)
COMPAT_SYS(shmctl) SYSCALL(ni_syscall)
SYSCALL(mlock2) SYSCALL(mlock2)
...@@ -388,18 +388,6 @@ ...@@ -388,18 +388,6 @@
#define __NR_switch_endian 363 #define __NR_switch_endian 363
#define __NR_userfaultfd 364 #define __NR_userfaultfd 364
#define __NR_membarrier 365 #define __NR_membarrier 365
#define __NR_semop 366
#define __NR_semget 367
#define __NR_semctl 368
#define __NR_semtimedop 369
#define __NR_msgsnd 370
#define __NR_msgrcv 371
#define __NR_msgget 372
#define __NR_msgctl 373
#define __NR_shmat 374
#define __NR_shmdt 375
#define __NR_shmget 376
#define __NR_shmctl 377
#define __NR_mlock2 378 #define __NR_mlock2 378
#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
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