oprofile: select RING_BUFFER

[linux-2.6] / arch / mips / kernel / signal_n32.c

diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index a9202fa..bb277e8 100644 (file)
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -19,7 +19,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
 #include <linux/errno.h>
@@ -73,7 +72,7 @@ struct ucontextn32 {
 struct rt_sigframe_n32 {
        u32 rs_ass[4];                  /* argument save space for o32 */
        u32 rs_code[2];                 /* signal trampoline */
-       struct siginfo rs_info;
+       struct compat_siginfo rs_info;
        struct ucontextn32 rs_uc;
 };
 
@@ -82,14 +81,14 @@ struct rt_sigframe_n32 {
 struct rt_sigframe_n32 {
        u32 rs_ass[4];                  /* argument save space for o32 */
        u32 rs_pad[2];
-       struct siginfo rs_info;
+       struct compat_siginfo rs_info;
        struct ucontextn32 rs_uc;
        u32 rs_code[8] ____cacheline_aligned;           /* signal trampoline */
 };
 
 #endif /* !ICACHE_REFILLS_WORKAROUND_WAR */
 
-extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
+extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
 
 asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
 {
@@ -106,7 +105,7 @@ asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
        unewset = (compat_sigset_t __user *) regs.regs[4];
        if (copy_from_user(&uset, unewset, sizeof(uset)))
                return -EFAULT;
-       sigset_from_compat (&newset, &uset);
+       sigset_from_compat(&newset, &uset);
        sigdelsetmask(&newset, ~_BLOCKABLE);
 
        spin_lock_irq(&current->sighand->siglock);
@@ -188,7 +187,7 @@ static int setup_rt_frame_n32(struct k_sigaction * ka,
        install_sigtramp(frame->rs_code, __NR_N32_rt_sigreturn);
 
        /* Create siginfo.  */
-       err |= copy_siginfo_to_user(&frame->rs_info, info);
+       err |= copy_siginfo_to_user32(&frame->rs_info, info);
 
        /* Create the ucontext.  */
        err |= __put_user(0, &frame->rs_uc.uc_flags);