sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file

[safe/jmp/linux-2.6] / arch / mips / kernel / signal32.c

diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 486b8e5..2e74075 100644 (file)
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/ptrace.h>
-#include <linux/compat.h>
 #include <linux/suspend.h>
 #include <linux/compiler.h>
 #include <linux/uaccess.h>
@@ -262,11 +261,11 @@ static inline int put_sigset(const sigset_t *kbuf, compat_sigset_t __user *ubuf)
        default:
                __put_sigset_unknown_nsig();
        case 2:
-               err |= __put_user (kbuf->sig[1] >> 32, &ubuf->sig[3]);
-               err |= __put_user (kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]);
+               err |= __put_user(kbuf->sig[1] >> 32, &ubuf->sig[3]);
+               err |= __put_user(kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]);
        case 1:
-               err |= __put_user (kbuf->sig[0] >> 32, &ubuf->sig[1]);
-               err |= __put_user (kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]);
+               err |= __put_user(kbuf->sig[0] >> 32, &ubuf->sig[1]);
+               err |= __put_user(kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]);
        }
 
        return err;
@@ -284,12 +283,12 @@ static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t __user *ubuf)
        default:
                __get_sigset_unknown_nsig();
        case 2:
-               err |= __get_user (sig[3], &ubuf->sig[3]);
-               err |= __get_user (sig[2], &ubuf->sig[2]);
+               err |= __get_user(sig[3], &ubuf->sig[3]);
+               err |= __get_user(sig[2], &ubuf->sig[2]);
                kbuf->sig[1] = sig[2] | (sig[3] << 32);
        case 1:
-               err |= __get_user (sig[1], &ubuf->sig[1]);
-               err |= __get_user (sig[0], &ubuf->sig[0]);
+               err |= __get_user(sig[1], &ubuf->sig[1]);
+               err |= __get_user(sig[0], &ubuf->sig[0]);
                kbuf->sig[0] = sig[0] | (sig[1] << 32);
        }
 
@@ -350,8 +349,8 @@ asmlinkage int sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
        return -ERESTARTNOHAND;
 }
 
-asmlinkage int sys32_sigaction(int sig, const struct sigaction32 __user *act,
-                               struct sigaction32 __user *oact)
+SYSCALL_DEFINE3(32_sigaction, long, sig, const struct sigaction32 __user *, act,
+       struct sigaction32 __user *, oact)
 {
        struct k_sigaction new_ka, old_ka;
        int ret;
@@ -413,10 +412,10 @@ asmlinkage int sys32_sigaltstack(nabi_no_regargs struct pt_regs regs)
                        return -EFAULT;
        }
 
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        ret = do_sigaltstack(uss ? (stack_t __user *)&kss : NULL,
                             uoss ? (stack_t __user *)&koss : NULL, usp);
-       set_fs (old_fs);
+       set_fs(old_fs);
 
        if (!ret && uoss) {
                if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
@@ -483,6 +482,18 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
        return err;
 }
 
+int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
+{
+       memset(to, 0, sizeof *to);
+
+       if (copy_from_user(to, from, 3*sizeof(int)) ||
+           copy_from_user(to->_sifields._pad,
+                          from->_sifields._pad, SI_PAD_SIZE32))
+               return -EFAULT;
+
+       return 0;
+}
+
 asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)
 {
        struct sigframe32 __user *frame;
@@ -560,9 +571,9 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
        /* It is more difficult to avoid calling this function than to
           call it and ignore errors.  */
        old_fs = get_fs();
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        do_sigaltstack((stack_t __user *)&st, NULL, regs.regs[29]);
-       set_fs (old_fs);
+       set_fs(old_fs);
 
        /*
         * Don't let your children do this ...
@@ -693,9 +704,9 @@ struct mips_abi mips_abi_32 = {
        .restart        = __NR_O32_restart_syscall
 };
 
-asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
-                                 struct sigaction32 __user *oact,
-                                 unsigned int sigsetsize)
+SYSCALL_DEFINE4(32_rt_sigaction, int, sig,
+       const struct sigaction32 __user *, act,
+       struct sigaction32 __user *, oact, unsigned int, sigsetsize)
 {
        struct k_sigaction new_sa, old_sa;
        int ret = -EINVAL;
@@ -737,8 +748,8 @@ out:
        return ret;
 }
 
-asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
-       compat_sigset_t __user *oset, unsigned int sigsetsize)
+SYSCALL_DEFINE4(32_rt_sigprocmask, int, how, compat_sigset_t __user *, set,
+       compat_sigset_t __user *, oset, unsigned int, sigsetsize)
 {
        sigset_t old_set, new_set;
        int ret;
@@ -747,11 +758,11 @@ asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
        if (set && get_sigset(&new_set, set))
                return -EFAULT;
 
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        ret = sys_rt_sigprocmask(how, set ? (sigset_t __user *)&new_set : NULL,
                                 oset ? (sigset_t __user *)&old_set : NULL,
                                 sigsetsize);
-       set_fs (old_fs);
+       set_fs(old_fs);
 
        if (!ret && oset && put_sigset(&old_set, oset))
                return -EFAULT;
@@ -759,16 +770,16 @@ asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
        return ret;
 }
 
-asmlinkage int sys32_rt_sigpending(compat_sigset_t __user *uset,
-       unsigned int sigsetsize)
+SYSCALL_DEFINE2(32_rt_sigpending, compat_sigset_t __user *, uset,
+       unsigned int, sigsetsize)
 {
        int ret;
        sigset_t set;
        mm_segment_t old_fs = get_fs();
 
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        ret = sys_rt_sigpending((sigset_t __user *)&set, sigsetsize);
-       set_fs (old_fs);
+       set_fs(old_fs);
 
        if (!ret && put_sigset(&set, uset))
                return -EFAULT;
@@ -776,25 +787,25 @@ asmlinkage int sys32_rt_sigpending(compat_sigset_t __user *uset,
        return ret;
 }
 
-asmlinkage int sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
+SYSCALL_DEFINE3(32_rt_sigqueueinfo, int, pid, int, sig,
+       compat_siginfo_t __user *, uinfo)
 {
        siginfo_t info;
        int ret;
        mm_segment_t old_fs = get_fs();
 
-       if (copy_from_user (&info, uinfo, 3*sizeof(int)) ||
-           copy_from_user (info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE))
+       if (copy_from_user(&info, uinfo, 3*sizeof(int)) ||
+           copy_from_user(info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE))
                return -EFAULT;
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
-       set_fs (old_fs);
+       set_fs(old_fs);
        return ret;
 }
 
-asmlinkage long
-sys32_waitid(int which, compat_pid_t pid,
-            compat_siginfo_t __user *uinfo, int options,
-            struct compat_rusage __user *uru)
+SYSCALL_DEFINE5(32_waitid, int, which, compat_pid_t, pid,
+            compat_siginfo_t __user *, uinfo, int, options,
+            struct compat_rusage __user *, uru)
 {
        siginfo_t info;
        struct rusage ru;
@@ -802,10 +813,10 @@ sys32_waitid(int which, compat_pid_t pid,
        mm_segment_t old_fs = get_fs();
 
        info.si_signo = 0;
-       set_fs (KERNEL_DS);
+       set_fs(KERNEL_DS);
        ret = sys_waitid(which, pid, (siginfo_t __user *) &info, options,
                         uru ? (struct rusage __user *) &ru : NULL);
-       set_fs (old_fs);
+       set_fs(old_fs);
 
        if (ret < 0 || info.si_signo == 0)
                return ret;