From a47825dd8164ecefb498543be3bcba1e584c2146 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Wed, 8 May 2013 17:01:12 +0100
Subject: [PATCH] --- yaml --- r: 375744 b: refs/heads/master c:
 9c413e25d95fd3c0abe23eadad66191b22baa549 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm64/kernel/debug-monitors.c | 2 --
 trunk/arch/arm64/mm/proc.S               | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6051772e336f..7a1036ba285c 100644
--- 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
index 0c3ba9f51376..f4726dc054b3 100644
--- 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
index f1d8b9bbfdad..a82ae8868077 100644
--- 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: