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

parents 19393412 d24c8163

arch/nios2/kernel/signal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;