diff options
-rw-r--r-- | arch/arm64/kernel/debug-monitors.c | 2 | ||||
-rw-r--r-- | arch/arm64/mm/proc.S | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index 0c3ba9f51376..f4726dc054b3 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c | |||
@@ -136,8 +136,6 @@ void disable_debug_monitors(enum debug_el el) | |||
136 | */ | 136 | */ |
137 | static void clear_os_lock(void *unused) | 137 | static void clear_os_lock(void *unused) |
138 | { | 138 | { |
139 | asm volatile("msr mdscr_el1, %0" : : "r" (0)); | ||
140 | isb(); | ||
141 | asm volatile("msr oslar_el1, %0" : : "r" (0)); | 139 | asm volatile("msr oslar_el1, %0" : : "r" (0)); |
142 | isb(); | 140 | isb(); |
143 | } | 141 | } |
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index f1d8b9bbfdad..a82ae8868077 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S | |||
@@ -119,8 +119,7 @@ ENTRY(__cpu_setup) | |||
119 | 119 | ||
120 | mov x0, #3 << 20 | 120 | mov x0, #3 << 20 |
121 | msr cpacr_el1, x0 // Enable FP/ASIMD | 121 | msr cpacr_el1, x0 // Enable FP/ASIMD |
122 | mov x0, #1 | 122 | msr mdscr_el1, xzr // Reset mdscr_el1 |
123 | msr oslar_el1, x0 // Set the debug OS lock | ||
124 | tlbi vmalle1is // invalidate I + D TLBs | 123 | tlbi vmalle1is // invalidate I + D TLBs |
125 | /* | 124 | /* |
126 | * Memory region attributes for LPAE: | 125 | * Memory region attributes for LPAE: |