Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[sfrench/cifs-2.6.git] / arch / sh / kernel / signal.c

diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index e323e299878b7a101087ae1d08d84bf6295776f1..706d81ccd10149e15e28ffbfeed70e69a656e009 100644 (file)
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -23,6 +23,7 @@
 #include <linux/personality.h>
 #include <linux/binfmts.h>
 #include <linux/freezer.h>
+#include <linux/io.h>
 #include <asm/system.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -261,7 +262,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
                goto badframe;
        /* It is more difficult to avoid calling this function than to
           call it and ignore errors.  */
-       do_sigaltstack(&st, NULL, regs->regs[15]);
+       do_sigaltstack((const stack_t __user *)&st, NULL, (unsigned long)frame);
 
        return r0;