From abc2e64fe596f86bf7264a2368a0a9c151cfc8cc Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@kernel.org>
Date: Thu, 2 Jul 2009 22:33:59 +0530
Subject: [PATCH] --- yaml --- r: 155042 b: refs/heads/master c:
 23d0cd8e718723f1ddda37637bc6b7c34caec64a h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/apic/apic.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 627305bbfedc..dea99dbb2f09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3ac88157c1e9153f37cd2b9313117ae11735063
+refs/heads/master: 23d0cd8e718723f1ddda37637bc6b7c34caec64a
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
index 8c7c042ecad1..0a1c2830ec66 100644
--- a/trunk/arch/x86/kernel/apic/apic.c
+++ b/trunk/arch/x86/kernel/apic/apic.c
@@ -140,7 +140,6 @@ int x2apic_mode;
 #ifdef CONFIG_X86_X2APIC
 /* x2apic enabled before OS handover */
 static int x2apic_preenabled;
-static int disable_x2apic;
 static __init int setup_nox2apic(char *str)
 {
 	if (x2apic_enabled()) {
@@ -149,7 +148,6 @@ static __init int setup_nox2apic(char *str)
 		return 0;
 	}
 
-	disable_x2apic = 1;
 	setup_clear_cpu_cap(X86_FEATURE_X2APIC);
 	return 0;
 }