diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-09 11:25:48 +1000 |
| commit | 5f07aa7524e98d6f68f2bec54f155ef6012e2c9a (patch) | |
| tree | 393b2db3213e6618ad1338f9b66019b0c05c6f75 /arch/powerpc/kernel/signal.c | |
| parent | e467e104bb7482170b79f516d2025e7cfcaaa733 (diff) | |
| parent | d09ec7387184eba9e3030496f0451204090ff610 (diff) | |
| download | kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.zip kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.tar.gz kernel_samsung_smdk4412-5f07aa7524e98d6f68f2bec54f155ef6012e2c9a.tar.bz2 | |
Merge commit 'paulus-perf/master' into next
Diffstat (limited to 'arch/powerpc/kernel/signal.c')
| -rw-r--r-- | arch/powerpc/kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index a0afb55..7109f5b 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -11,6 +11,7 @@ #include <linux/tracehook.h> #include <linux/signal.h> +#include <asm/hw_breakpoint.h> #include <asm/uaccess.h> #include <asm/unistd.h> @@ -149,6 +150,8 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) if (current->thread.dabr) set_dabr(current->thread.dabr); #endif + /* Re-enable the breakpoints for the signal stack */ + thread_change_pc(current, regs); if (is32) { if (ka.sa.sa_flags & SA_SIGINFO) |