Merge tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux…

…-socfpga-next Pull one arch/nios2 fix from Ley Foon Tan: "Fix kuser trampoline address" * tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next: nios2: fix kuser trampoline address
git-mirror · Jan 22, 2015 · fcb2373 · fcb2373
2 parents 1939341 + d24c816
commit fcb2373
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c
@@ -200,7 +200,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 
 	/* Set up to return from userspace; jump to fixed address sigreturn
 	   trampoline on kuser page.  */
-	regs->ra = (unsigned long) (0x1040);
+	regs->ra = (unsigned long) (0x1044);
 
 	/* Set up registers for signal handler */
 	regs->sp = (unsigned long) frame;