diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-23 06:52:14 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-23 06:52:14 +1200 |
| commit | fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5 (patch) | |
| tree | 8148b2195ee0d487d1d7b8c8d2f4b65b0e597eb6 /arch | |
| parent | 193934123c84fa168d0326aa6ab8d58cd173b32a (diff) | |
| parent | d24c8163b755be4a47482ab8240090d56ca8ef9b (diff) | |
| download | linux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.tar.gz linux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.tar.bz2 linux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c index f9d27883a714..2d0ea25be171 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; |