diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
| commit | d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (patch) | |
| tree | 2aa6702ee7c153d909a820ae9fda14d35877e59e /arch/powerpc/kernel/signal_64.c | |
| parent | 90edf27fb89241917e91155bfdcc7c8e5a587222 (diff) | |
| parent | c79bd89282136a4516e842fa542d6abf902ddeac (diff) | |
| download | kernel_samsung_smdk4412-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.zip kernel_samsung_smdk4412-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.gz kernel_samsung_smdk4412-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.bz2 | |
Merge branch 'linus' into perf/core
Conflicts:
arch/sparc/kernel/perf_event.c
Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/signal_64.c')
| -rw-r--r-- | arch/powerpc/kernel/signal_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 2fe6fc6..27c4a45 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -178,7 +178,7 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, err |= __get_user(regs->xer, &sc->gp_regs[PT_XER]); err |= __get_user(regs->ccr, &sc->gp_regs[PT_CCR]); /* skip SOFTE */ - err |= __get_user(regs->trap, &sc->gp_regs[PT_TRAP]); + regs->trap = 0; err |= __get_user(regs->dar, &sc->gp_regs[PT_DAR]); err |= __get_user(regs->dsisr, &sc->gp_regs[PT_DSISR]); err |= __get_user(regs->result, &sc->gp_regs[PT_RESULT]); |