Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / include / asm / hw_breakpoint.h

diff --git a/arch/powerpc/include/asm/hw_breakpoint.h b/arch/powerpc/include/asm/hw_breakpoint.h
index be04330af75194562e3473084fd33ec7589dd696..423424599dad9395a00f15df23ce17676be872ac 100644 (file)
--- a/arch/powerpc/include/asm/hw_breakpoint.h
+++ b/arch/powerpc/include/asm/hw_breakpoint.h
@@ -27,10 +27,11 @@
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
 
 struct arch_hw_breakpoint {
-       bool            extraneous_interrupt;
-       u8              len; /* length of the target data symbol */
-       int             type;
        unsigned long   address;
+       unsigned long   dabrx;
+       int             type;
+       u8              len; /* length of the target data symbol */
+       bool            extraneous_interrupt;
 };
 
 #include <linux/kdebug.h>
@@ -61,7 +62,7 @@ extern void ptrace_triggered(struct perf_event *bp,
                        struct perf_sample_data *data, struct pt_regs *regs);
 static inline void hw_breakpoint_disable(void)
 {
-       set_dabr(0);
+       set_dabr(0, 0);
 }
 extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);