diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
commit | f10698ed6807dc41d021fb7baeb24f9bc4051837 (patch) | |
tree | fe9229efe38ad31788843a7535bfc3feb89f79a7 /arch/nios2/kernel/signal.c | |
parent | 86038c5ea81b519a8a1fcfcd5e4599aab0cdd119 (diff) | |
parent | e742f3dc0886a92403d578e8ac771e5e33d06d08 (diff) | |
download | linux-f10698ed6807dc41d021fb7baeb24f9bc4051837.tar.bz2 |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |