Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335Ab0FWKIG (ORCPT ); Wed, 23 Jun 2010 06:08:06 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:49566 "EHLO e23smtp05.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752866Ab0FWKEd (ORCPT ); Wed, 23 Jun 2010 06:04:33 -0400 From: "Ian Munsie" To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Cc: Jason Baron , Frederic Weisbecker , Steven Rostedt , Ingo Molnar , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Ian Munsie , Dave Kleikamp , David Gibson , Chase Douglas , "Eric W. Biederman" , Alexey Dobriyan Subject: [PATCH 24/40] trace syscalls, PPC: Convert more ppc32 compat syscalls to COMPAT_SYSCALL Date: Wed, 23 Jun 2010 20:03:05 +1000 Message-Id: <1277287401-28571-25-git-send-email-imunsie@au1.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> References: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5402 Lines: 153 From: Ian Munsie Convert the remaining trivial 32bit compat syscalls to use the COMPAT_SYSCALL_DEFINE family of macros. The syscalls addressed by this commit were lacking the asmlinkage flag, which will be added by the COMPAT_SYSCALL_DEFINE macros. This should not be an issue as asmlinkage has no effect on PowerPC. Signed-off-by: Ian Munsie --- arch/powerpc/kernel/signal_32.c | 19 +++++++++++++------ arch/powerpc/kernel/sys_ppc32.c | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 2666101..e65d311 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -595,8 +595,10 @@ static long restore_user_regs(struct pt_regs *regs, } #ifdef CONFIG_PPC64 -long compat_sys_rt_sigaction(int sig, const struct sigaction32 __user *act, - struct sigaction32 __user *oact, size_t sigsetsize) +COMPAT_SYSCALL_DEFINE4(rt_sigaction, int, sig, + const struct sigaction32 __user *, act, + struct sigaction32 __user *, oact, + size_t, sigsetsize) { struct k_sigaction new_ka, old_ka; int ret; @@ -632,8 +634,10 @@ long compat_sys_rt_sigaction(int sig, const struct sigaction32 __user *act, * of a signed int (msr in 32-bit mode) and the register representation * of a signed int (msr in 64-bit mode) is performed. */ -long compat_sys_rt_sigprocmask(u32 how, compat_sigset_t __user *set, - compat_sigset_t __user *oset, size_t sigsetsize) +COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, u32, how, + compat_sigset_t __user *, set, + compat_sigset_t __user *, oset, + size_t, sigsetsize) { sigset_t s; sigset_t __user *up; @@ -660,7 +664,9 @@ long compat_sys_rt_sigprocmask(u32 how, compat_sigset_t __user *set, return 0; } -long compat_sys_rt_sigpending(compat_sigset_t __user *set, compat_size_t sigsetsize) +COMPAT_SYSCALL_DEFINE2(rt_sigpending, + compat_sigset_t __user *, set, + compat_size_t, sigsetsize) { sigset_t s; int ret; @@ -754,7 +760,8 @@ int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from) * (msr in 32-bit mode) and the register representation of a signed int * (msr in 64-bit mode) is performed. */ -long compat_sys_rt_sigqueueinfo(u32 pid, u32 sig, compat_siginfo_t __user *uinfo) +COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo, u32, pid, u32, sig, + compat_siginfo_t __user *, uinfo) { siginfo_t info; int ret; diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index ab45dde..6fc8ba9 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -73,8 +73,8 @@ COMPAT_SYSCALL_DEFINE3(sysfs, u32, option, u32, arg1, } #ifdef CONFIG_SYSVIPC -long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr, - u32 fifth) +COMPAT_SYSCALL_DEFINE6(ipc, u32, call, u32, first, u32, second, u32, third, + compat_uptr_t, ptr, u32, fifth) { int version; @@ -340,7 +340,7 @@ COMPAT_SYSCALL_DEFINE2(mkdir, const char __user *, pathname, return sys_mkdir(pathname, (int)mode); } -long compat_sys_nice(u32 increment) +COMPAT_SYSCALL_DEFINE1(nice, u32, increment) { /* sign extend increment */ return sys_nice((int)increment); @@ -352,13 +352,13 @@ off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin) return sys_lseek(fd, (int)offset, origin); } -long compat_sys_truncate(const char __user * path, u32 length) +COMPAT_SYSCALL_DEFINE2(truncate, const char __user *, path, u32, length) { /* sign extend length */ return sys_truncate(path, (int)length); } -long compat_sys_ftruncate(int fd, u32 length) +COMPAT_SYSCALL_DEFINE2(ftruncate, int, fd, u32, length) { /* sign extend length */ return sys_ftruncate(fd, (int)length); @@ -486,25 +486,25 @@ COMPAT_SYSCALL_DEFINE2(setpgid, u32, pid, u32, pgid) return sys_setpgid((int)pid, (int)pgid); } -long compat_sys_getpriority(u32 which, u32 who) +COMPAT_SYSCALL_DEFINE2(getpriority, u32, which, u32, who) { /* sign extend which and who */ return sys_getpriority((int)which, (int)who); } -long compat_sys_setpriority(u32 which, u32 who, u32 niceval) +COMPAT_SYSCALL_DEFINE3(setpriority, u32, which, u32, who, u32, niceval) { /* sign extend which, who and niceval */ return sys_setpriority((int)which, (int)who, (int)niceval); } -long compat_sys_ioprio_get(u32 which, u32 who) +COMPAT_SYSCALL_DEFINE2(ioprio_get, u32, which, u32, who) { /* sign extend which and who */ return sys_ioprio_get((int)which, (int)who); } -long compat_sys_ioprio_set(u32 which, u32 who, u32 ioprio) +COMPAT_SYSCALL_DEFINE3(ioprio_set, u32, which, u32, who, u32, ioprio) { /* sign extend which, who and ioprio */ return sys_ioprio_set((int)which, (int)who, (int)ioprio); @@ -546,7 +546,7 @@ unsigned long compat_sys_mmap2(unsigned long addr, size_t len, return sys_mmap(addr, len, prot, flags, fd, pgoff << 12); } -long compat_sys_tgkill(u32 tgid, u32 pid, int sig) +COMPAT_SYSCALL_DEFINE3(tgkill, u32, tgid, u32, pid, int, sig) { /* sign extend tgid, pid */ return sys_tgkill((int)tgid, (int)pid, sig); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/