---

yaml --- r: 375744 b: refs/heads/master c: 9c413e2 h: refs/heads/master v: v3
git-mirror · May 13, 2013 · a47825d · a47825d
1 parent c87b830
commit a47825d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 182a6f73ec6bc83ce9b72eec20fa1c6901338c16
+refs/heads/master: 9c413e25d95fd3c0abe23eadad66191b22baa549
diff --git a/trunk/arch/arm64/kernel/debug-monitors.c b/trunk/arch/arm64/kernel/debug-monitors.c
@@ -136,8 +136,6 @@ void disable_debug_monitors(enum debug_el el)
  */
 static void clear_os_lock(void *unused)
 {
-	asm volatile("msr mdscr_el1, %0" : : "r" (0));
-	isb();
 	asm volatile("msr oslar_el1, %0" : : "r" (0));
 	isb();
 }

diff --git a/trunk/arch/arm64/mm/proc.S b/trunk/arch/arm64/mm/proc.S
@@ -119,8 +119,7 @@ ENTRY(__cpu_setup)
 
 	mov	x0, #3 << 20
 	msr	cpacr_el1, x0			// Enable FP/ASIMD
-	mov	x0, #1
-	msr	oslar_el1, x0			// Set the debug OS lock
+	msr	mdscr_el1, xzr			// Reset mdscr_el1
 	tlbi	vmalle1is			// invalidate I + D TLBs
 	/*
 	 * Memory region attributes for LPAE:
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,8 +136,6 @@ void disable_debug_monitors(enum debug_el el) @@
      */
     static void clear_os_lock(void *unused)
     {
-    	asm volatile("msr mdscr_el1, %0" : : "r" (0));
-    	isb();
     	asm volatile("msr oslar_el1, %0" : : "r" (0));
     	isb();
     }
@@ Expand Down @@