From 11e1f6518e563c428b7df5a7daf4361c54320159 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 19 Aug 2008 20:50:40 -0700
Subject: [PATCH] --- yaml --- r: 116445 b: refs/heads/master c:
 aa45f97b1bb40adae1288669e73350907ffae85e h: refs/heads/master i:   116443:
 944626679a22ae32c38a6f8133aca4d8c2a03c44 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/apic_64.c    | 1 -
 trunk/arch/x86/kernel/io_apic_64.c | 2 --
 trunk/include/asm-x86/apic.h       | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5d04bdfa0c95..ee4ed48d65b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f876d213a59c363d2492e399cc6c24edd6f3c368
+refs/heads/master: aa45f97b1bb40adae1288669e73350907ffae85e
diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c
index 4d7a188025b3..cd860856a0b7 100644
--- a/trunk/arch/x86/kernel/apic_64.c
+++ b/trunk/arch/x86/kernel/apic_64.c
@@ -1813,7 +1813,6 @@ static int __init apic_set_verbosity(char *arg)
 	if (!arg)  {
 #ifdef CONFIG_X86_64
 		skip_ioapic_setup = 0;
-		ioapic_force = 1;
 		return 0;
 #endif
 		return -EINVAL;
diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c
index 915af9b87aa4..b70fd8232185 100644
--- a/trunk/arch/x86/kernel/io_apic_64.c
+++ b/trunk/arch/x86/kernel/io_apic_64.c
@@ -63,8 +63,6 @@
 
 #define __apicdebuginit(type) static type __init
 
-int ioapic_force;
-
 /*
  *      Is the SiS APIC rmw bug present ?
  *      -1 = don't know, 0 = no, 1 = yes
diff --git a/trunk/include/asm-x86/apic.h b/trunk/include/asm-x86/apic.h
index d76a0839abe9..2d970f6bc2a1 100644
--- a/trunk/include/asm-x86/apic.h
+++ b/trunk/include/asm-x86/apic.h
@@ -40,8 +40,6 @@ extern void generic_apic_probe(void);
 extern unsigned int apic_verbosity;
 extern int local_apic_timer_c2_ok;
 
-extern int ioapic_force;
-
 extern int disable_apic;
 /*
  * Basic functions accessing APICs.