tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/syscalls: switch rtas(2) to SYSCALL_DEFINE

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[mpe: Update sys_ni.c for s/ppc_rtas/sys_rtas/]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Al Viro and committed by
Michael Ellerman 4c392e65 f3675644

+5 -7
+1 -1
arch/powerpc/include/asm/syscalls.h
··· 16 16 unsigned long prot, unsigned long flags, 17 17 unsigned long fd, unsigned long pgoff); 18 18 asmlinkage long ppc64_personality(unsigned long personality); 19 - asmlinkage int ppc_rtas(struct rtas_args __user *uargs); 19 + asmlinkage long sys_rtas(struct rtas_args __user *uargs); 20 20 21 21 #endif /* __KERNEL__ */ 22 22 #endif /* __ASM_POWERPC_SYSCALLS_H */
+1 -1
arch/powerpc/include/asm/systbl.h
··· 260 260 COMPAT_SYS_SPU(statfs64) 261 261 COMPAT_SYS_SPU(fstatfs64) 262 262 SYSX(sys_ni_syscall,ppc_fadvise64_64,ppc_fadvise64_64) 263 - PPC_SYS_SPU(rtas) 263 + SYSCALL_SPU(rtas) 264 264 OLDSYS(debug_setcontext) 265 265 SYSCALL(ni_syscall) 266 266 COMPAT_SYS(migrate_pages)
+2 -1
arch/powerpc/kernel/rtas.c
··· 26 26 #include <linux/memblock.h> 27 27 #include <linux/slab.h> 28 28 #include <linux/reboot.h> 29 + #include <linux/syscalls.h> 29 30 30 31 #include <asm/prom.h> 31 32 #include <asm/rtas.h> ··· 1051 1050 } 1052 1051 1053 1052 /* We assume to be passed big endian arguments */ 1054 - asmlinkage int ppc_rtas(struct rtas_args __user *uargs) 1053 + SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs) 1055 1054 { 1056 1055 struct rtas_args args; 1057 1056 unsigned long flags;
-1
arch/powerpc/kernel/systbl.S
··· 35 35 #endif 36 36 #define SYSCALL_SPU(func) SYSCALL(func) 37 37 #define COMPAT_SYS_SPU(func) COMPAT_SYS(func) 38 - #define PPC_SYS_SPU(func) PPC_SYS(func) 39 38 #define SYSX_SPU(f, f3264, f32) SYSX(f, f3264, f32) 40 39 41 40 .section .rodata,"a"
-1
arch/powerpc/kernel/systbl_chk.c
··· 31 31 32 32 #define SYSCALL_SPU(func) SYSCALL(func) 33 33 #define COMPAT_SYS_SPU(func) COMPAT_SYS(func) 34 - #define PPC_SYS_SPU(func) PPC_SYS(func) 35 34 #define SYSX_SPU(f, f3264, f32) SYSX(f, f3264, f32) 36 35 37 36 /* Just insert a marker for ni_syscalls */
-1
arch/powerpc/platforms/cell/spu_callbacks.c
··· 44 44 45 45 #define SYSCALL_SPU(func) sys_##func, 46 46 #define COMPAT_SYS_SPU(func) sys_##func, 47 - #define PPC_SYS_SPU(func) ppc_##func, 48 47 #define SYSX_SPU(f, f3264, f32) f, 49 48 50 49 #include <asm/systbl.h>
+1 -1
kernel/sys_ni.c
··· 365 365 COND_SYSCALL_COMPAT(s390_ipc); 366 366 367 367 /* powerpc */ 368 - cond_syscall(ppc_rtas); 368 + COND_SYSCALL(rtas); 369 369 COND_SYSCALL(spu_run); 370 370 COND_SYSCALL(spu_create); 371 371 COND_SYSCALL(subpage_prot);