powerpc: Disable interrupts for data breakpoint exceptions

[mirror_ubuntu-zesty-kernel.git] / arch / powerpc / mm / fault.c

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 26fb6b990b0a78704642e9e5999aed2dd3b6b945..83ac4935eb105fcd97832bff95035c53d6584e3a 100644 (file)
--- 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,
        if (!user_mode(regs) && (address >= TASK_SIZE))
                return SIGSEGV;
 
-#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
+#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE) || \
+                            defined(CONFIG_PPC_BOOK3S_64))
        if (error_code & DSISR_DABRMATCH) {
                /* DABR match */
                do_dabr(regs, address, error_code);
                return 0;
        }
-#endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/
+#endif
 
        if (in_atomic() || mm == NULL) {
                if (!user_mode(regs))