powerpc/syscalls: Add COMPAT_SPU_NEW() macro

Currently the select system call is wired up with the SYSX_SPU()
macro. The SYSX_SPU() is not handled by systbl_chk.c, which means the
syscall number for select is not checked.

That hides the fact that the syscall number for select is actually
__NR__newselect not __NR_select.

In a following patch we'd like to drop ppc32_select() which means
select will become a regular COMPAT_SYS_SPU() syscall. But
COMPAT_SYS_SPU() can't deal with the fact that the syscall number is
actually __NR__newselect. We also can't just redefine __NR_select
because that's still used for the old select call.

So add a new COMPAT_NEW_SPU() that does the same thing as
COMPAT_SYS_SPU() except it encodes that we're using the new number.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index c7d5216d91d76de1cf02179f12f72c6877461edb..919a32746ede99975b1c583dd8b187e201540db3 100644 (file)
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -35,6 +35,7 @@
 #endif
 #define SYSCALL_SPU(func)      SYSCALL(func)
 #define COMPAT_SYS_SPU(func)   COMPAT_SYS(func)
+#define COMPAT_SPU_NEW(func)   COMPAT_SYS(func)
 #define SYSX_SPU(f, f3264, f32)        SYSX(f, f3264, f32)
 
 .section .rodata,"a"

diff --git a/arch/powerpc/kernel/systbl_chk.c b/arch/powerpc/kernel/systbl_chk.c
index 28476e81164480023a1b160d74b381e2e9ecbbc7..4653258722ac042cc0f2ef120ec7f71753d97b54 100644 (file)
--- a/arch/powerpc/kernel/systbl_chk.c
+++ b/arch/powerpc/kernel/systbl_chk.c
@@ -31,6 +31,7 @@
 
 #define SYSCALL_SPU(func)      SYSCALL(func)
 #define COMPAT_SYS_SPU(func)   COMPAT_SYS(func)
+#define COMPAT_SPU_NEW(func)   COMPAT_SYS(_new##func)
 #define SYSX_SPU(f, f3264, f32)        SYSX(f, f3264, f32)
 
 /* Just insert a marker for ni_syscalls */

diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index d5bb8c8d769a64988c93e19eeece9ccba912d568..8ae86200ef6c790e04ef3f425e40ccff26bdb937 100644 (file)
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -44,6 +44,7 @@ static void *spu_syscall_table[] = {
 
 #define SYSCALL_SPU(func)      sys_##func,
 #define COMPAT_SYS_SPU(func)   sys_##func,
+#define COMPAT_SPU_NEW(func)   sys_##func,
 #define SYSX_SPU(f, f3264, f32)        f,
 
 #include <asm/systbl.h>