diff options
author | K.Prasad <prasad@linux.vnet.ibm.com> | 2010-03-29 19:59:25 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-04-07 00:44:38 -0400 |
commit | 9c7cc234dc5edf5379fbbab4973f6704f59bc57b (patch) | |
tree | 6129dffa0ffc36da27718059c9b2ff40b74aa16b /arch/powerpc/mm/fault.c | |
parent | 578b7cd1518f8d1b17a7fb1671d3d756c9cb49f1 (diff) |
powerpc: Disable interrupts for data breakpoint exceptions
Data address breakpoint exceptions are currently handled along with page-faults
which require interrupts to remain in enabled state. Since exception handling
for data breakpoints aren't pre-empt safe, we handle them separately.
Signed-off-by: K.Prasad <prasad@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r-- | arch/powerpc/mm/fault.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 26fb6b990b0a..83ac4935eb10 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -151,13 +151,14 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, | |||
151 | if (!user_mode(regs) && (address >= TASK_SIZE)) | 151 | if (!user_mode(regs) && (address >= TASK_SIZE)) |
152 | return SIGSEGV; | 152 | return SIGSEGV; |
153 | 153 | ||
154 | #if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE)) | 154 | #if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE) || \ |
155 | defined(CONFIG_PPC_BOOK3S_64)) | ||
155 | if (error_code & DSISR_DABRMATCH) { | 156 | if (error_code & DSISR_DABRMATCH) { |
156 | /* DABR match */ | 157 | /* DABR match */ |
157 | do_dabr(regs, address, error_code); | 158 | do_dabr(regs, address, error_code); |
158 | return 0; | 159 | return 0; |
159 | } | 160 | } |
160 | #endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/ | 161 | #endif |
161 | 162 | ||
162 | if (in_atomic() || mm == NULL) { | 163 | if (in_atomic() || mm == NULL) { |
163 | if (!user_mode(regs)) | 164 | if (!user_mode(regs)) |