Prev: [PATCH 22/40] trace syscalls, PPC: Convert syscalls to SYSCALL_DEFINE
Next: [PATCH 40/40] trace syscalls, PPC: Convert morphing native/compat syscalls
From: Ian Munsie on 23 Jun 2010 06:10 From: Ian Munsie <imunsie(a)au1.ibm.com> This patch renames the 32bit compat syscalls prefixed with ppc32_ to sys32_ and uses the ARCH_COMPAT_SYSCALL_DEFINE macros to record their metadata for tracing. Signed-off-by: Ian Munsie <imunsie(a)au1.ibm.com> --- arch/powerpc/include/asm/systbl.h | 4 ++-- arch/powerpc/kernel/sys_ppc32.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index 228eecb..bbcc700 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -236,9 +236,9 @@ COMPAT_SYS_SPU(io_getevents) COMPAT_SYS_SPU(io_submit) SYSCALL_SPU(io_cancel) SYSCALL(set_tid_address) -SYSX_SPU(sys_fadvise64,ppc32_fadvise64,sys_fadvise64) +SYSX_SPU(sys_fadvise64,sys32_fadvise64,sys_fadvise64) SYSCALL(exit_group) -SYSX(sys_lookup_dcookie,ppc32_lookup_dcookie,sys_lookup_dcookie) +SYSX(sys_lookup_dcookie,sys32_lookup_dcookie,sys_lookup_dcookie) SYSCALL_SPU(epoll_create) SYSCALL_SPU(epoll_ctl) SYSCALL_SPU(epoll_wait) diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 27cf460..cf18164 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -594,15 +594,15 @@ asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long h return sys_ftruncate(fd, (high << 32) | low); } -long ppc32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf, - size_t len) +ARCH_COMPAT_SYSCALL_DEFINE4(lookup_dcookie, u32, cookie_high, u32, cookie_low, + char __user *, buf, size_t, len) { return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low, buf, len); } -long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low, - size_t len, int advice) +ARCH_COMPAT_SYSCALL_DEFINE6(fadvise64, int, fd, u32, unused, u32, offset_high, + u32, offset_low, size_t, len, int, advice) { return sys_fadvise64(fd, (u64)offset_high << 32 | offset_low, len, advice); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |