diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-08 21:25:48 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-08 21:25:48 -0400 |
| commit | 5f07aa7524e98d6f68f2bec54f155ef6012e2c9a (patch) | |
| tree | 393b2db3213e6618ad1338f9b66019b0c05c6f75 /arch/powerpc/kernel/signal.c | |
| parent | e467e104bb7482170b79f516d2025e7cfcaaa733 (diff) | |
| parent | d09ec7387184eba9e3030496f0451204090ff610 (diff) | |
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 a0afb555a7c9..7109f5b1baa8 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/tracehook.h> | 12 | #include <linux/tracehook.h> |
| 13 | #include <linux/signal.h> | 13 | #include <linux/signal.h> |
| 14 | #include <asm/hw_breakpoint.h> | ||
| 14 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 15 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
| 16 | 17 | ||
| @@ -149,6 +150,8 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) | |||
| 149 | if (current->thread.dabr) | 150 | if (current->thread.dabr) |
| 150 | set_dabr(current->thread.dabr); | 151 | set_dabr(current->thread.dabr); |
| 151 | #endif | 152 | #endif |
| 153 | /* Re-enable the breakpoints for the signal stack */ | ||
| 154 | thread_change_pc(current, regs); | ||
| 152 | 155 | ||
| 153 | if (is32) { | 156 | if (is32) { |
| 154 | if (ka.sa.sa_flags & SA_SIGINFO) | 157 | if (ka.sa.sa_flags & SA_SIGINFO) |