From 7f320a657980facb52b3d35b2e7b62b67bca406d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Tue, 27 Jan 2009 21:41:34 +0100
Subject: [PATCH] --- yaml --- r: 136523 b: refs/heads/master c:
 8f6d86dc4178957d9814b1784848012a927a3898 h: refs/heads/master i:   136521:
 5af762395e172b670cd5f71fc466e8b0d6f773e7   136519:
 369fb3e96d3ffbc7b26f7961f36f864ab5d73642 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/cpu/common.c | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index fec78cd47c6f..76f28a8771a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc86c9e0dc1a41451240b948bb39d46bb2536ae8
+refs/heads/master: 8f6d86dc4178957d9814b1784848012a927a3898
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index f00258462444..3f272d42d09a 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -1071,22 +1071,19 @@ void __cpuinit cpu_init(void)
 	 */
 	if (kgdb_connected && arch_kgdb_ops.correct_hw_break)
 		arch_kgdb_ops.correct_hw_break();
-	else {
+	else
 #endif
-	/*
-	 * Clear all 6 debug registers:
-	 */
-
-	set_debugreg(0UL, 0);
-	set_debugreg(0UL, 1);
-	set_debugreg(0UL, 2);
-	set_debugreg(0UL, 3);
-	set_debugreg(0UL, 6);
-	set_debugreg(0UL, 7);
-#ifdef CONFIG_KGDB
-	/* If the kgdb is connected no debug regs should be altered. */
+	{
+		/*
+		 * Clear all 6 debug registers:
+		 */
+		set_debugreg(0UL, 0);
+		set_debugreg(0UL, 1);
+		set_debugreg(0UL, 2);
+		set_debugreg(0UL, 3);
+		set_debugreg(0UL, 6);
+		set_debugreg(0UL, 7);
 	}
-#endif
 
 	fpu_init();