Commit 4c392e65 authored by Al Viro's avatar Al Viro Committed by Michael Ellerman
Browse files

powerpc/syscalls: switch rtas(2) to SYSCALL_DEFINE 



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

arch/powerpc/include/asm/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ asmlinkage long sys_mmap2(unsigned long addr, size_t len, 
		unsigned long prot, unsigned long flags,

		unsigned long fd, unsigned long pgoff);

asmlinkage long ppc64_personality(unsigned long personality);

asmlinkage int ppc_rtas(struct rtas_args __user *uargs);

asmlinkage long sys_rtas(struct rtas_args __user *uargs);



#endif /* __KERNEL__ */

#endif /* __ASM_POWERPC_SYSCALLS_H */

arch/powerpc/include/asm/systbl.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(utimes) 
COMPAT_SYS_SPU(statfs64)

COMPAT_SYS_SPU(fstatfs64)

SYSX(sys_ni_syscall,ppc_fadvise64_64,ppc_fadvise64_64)

PPC_SYS_SPU(rtas)

SYSCALL_SPU(rtas)

OLDSYS(debug_setcontext)

SYSCALL(ni_syscall)

COMPAT_SYS(migrate_pages)

arch/powerpc/kernel/rtas.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/memblock.h>

#include <linux/slab.h>

#include <linux/reboot.h>

#include <linux/syscalls.h>



#include <asm/prom.h>

#include <asm/rtas.h>
@@ -1050,7 +1051,7 @@ struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log, 
}



/* We assume to be passed big endian arguments */

asmlinkage int ppc_rtas(struct rtas_args __user *uargs)

SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs)

{

	struct rtas_args args;

	unsigned long flags;

arch/powerpc/kernel/systbl.S

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#endif

#define SYSCALL_SPU(func)	SYSCALL(func)

#define COMPAT_SYS_SPU(func)	COMPAT_SYS(func)

#define PPC_SYS_SPU(func)	PPC_SYS(func)

#define SYSX_SPU(f, f3264, f32)	SYSX(f, f3264, f32)



.section .rodata,"a"

arch/powerpc/kernel/systbl_chk.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#define SYSCALL_SPU(func)	SYSCALL(func)

#define COMPAT_SYS_SPU(func)	COMPAT_SYS(func)

#define PPC_SYS_SPU(func)	PPC_SYS(func)

#define SYSX_SPU(f, f3264, f32)	SYSX(f, f3264, f32)



/* Just insert a marker for ni_syscalls */

CRA Git | Maintained and supported by SUSTech CRA and CCSE