aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-23 06:52:14 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-23 06:52:14 +1200
commitfcb237317f225f5bae1ab72a42f1f5a9c57ba3d5 (patch)
tree8148b2195ee0d487d1d7b8c8d2f4b65b0e597eb6 /arch
parent193934123c84fa168d0326aa6ab8d58cd173b32a (diff)
parentd24c8163b755be4a47482ab8240090d56ca8ef9b (diff)
downloadlinux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.tar.gz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/nios2/kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c
index f9d27883a71..2d0ea25be17 100644
--- 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;