diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-26 13:02:59 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-26 13:02:59 +0300 |
| commit | 64c96a57b73397415eafa4ac2020ea7d99d7168c (patch) | |
| tree | e71719d174d22aab6362858d383c292149ec8ae9 /arch/nios2/kernel/signal.c | |
| parent | e2e64a932556cdfae455497dbe94a8db151fc9fa (diff) | |
| parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
| download | linux-64c96a57b73397415eafa4ac2020ea7d99d7168c.tar.xz | |
Merge branch 'linus' into irq/core
Reason: Pull in upstream fixes on which new patches depend on.
Diffstat (limited to 'arch/nios2/kernel/signal.c')
| -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; |