diff options
Diffstat (limited to 'arch/arm/kernel/hw_breakpoint.c')
-rw-r--r-- | arch/arm/kernel/hw_breakpoint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index b5b452f90f76..7fc70ae21185 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/hw_breakpoint.h> | 29 | #include <linux/hw_breakpoint.h> |
30 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
31 | #include <linux/cpu_pm.h> | 31 | #include <linux/cpu_pm.h> |
32 | #include <linux/coresight.h> | ||
32 | 33 | ||
33 | #include <asm/cacheflush.h> | 34 | #include <asm/cacheflush.h> |
34 | #include <asm/cputype.h> | 35 | #include <asm/cputype.h> |
@@ -36,7 +37,6 @@ | |||
36 | #include <asm/hw_breakpoint.h> | 37 | #include <asm/hw_breakpoint.h> |
37 | #include <asm/kdebug.h> | 38 | #include <asm/kdebug.h> |
38 | #include <asm/traps.h> | 39 | #include <asm/traps.h> |
39 | #include <asm/hardware/coresight.h> | ||
40 | 40 | ||
41 | /* Breakpoint currently in use for each BRP. */ | 41 | /* Breakpoint currently in use for each BRP. */ |
42 | static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]); | 42 | static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]); |
@@ -976,7 +976,7 @@ static void reset_ctrl_regs(void *unused) | |||
976 | * Unconditionally clear the OS lock by writing a value | 976 | * Unconditionally clear the OS lock by writing a value |
977 | * other than CS_LAR_KEY to the access register. | 977 | * other than CS_LAR_KEY to the access register. |
978 | */ | 978 | */ |
979 | ARM_DBG_WRITE(c1, c0, 4, ~CS_LAR_KEY); | 979 | ARM_DBG_WRITE(c1, c0, 4, ~CORESIGHT_UNLOCK); |
980 | isb(); | 980 | isb(); |
981 | 981 | ||
982 | /* | 982 | /* |