diff options
-rw-r--r-- | arch/x86/kernel/apic_64.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 2 | ||||
-rw-r--r-- | include/asm-x86/apic.h | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 4d7a188025b3..cd860856a0b7 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -1813,7 +1813,6 @@ static int __init apic_set_verbosity(char *arg) | |||
1813 | if (!arg) { | 1813 | if (!arg) { |
1814 | #ifdef CONFIG_X86_64 | 1814 | #ifdef CONFIG_X86_64 |
1815 | skip_ioapic_setup = 0; | 1815 | skip_ioapic_setup = 0; |
1816 | ioapic_force = 1; | ||
1817 | return 0; | 1816 | return 0; |
1818 | #endif | 1817 | #endif |
1819 | return -EINVAL; | 1818 | return -EINVAL; |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 915af9b87aa4..b70fd8232185 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -63,8 +63,6 @@ | |||
63 | 63 | ||
64 | #define __apicdebuginit(type) static type __init | 64 | #define __apicdebuginit(type) static type __init |
65 | 65 | ||
66 | int ioapic_force; | ||
67 | |||
68 | /* | 66 | /* |
69 | * Is the SiS APIC rmw bug present ? | 67 | * Is the SiS APIC rmw bug present ? |
70 | * -1 = don't know, 0 = no, 1 = yes | 68 | * -1 = don't know, 0 = no, 1 = yes |
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index d76a0839abe9..2d970f6bc2a1 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
@@ -40,8 +40,6 @@ extern void generic_apic_probe(void); | |||
40 | extern unsigned int apic_verbosity; | 40 | extern unsigned int apic_verbosity; |
41 | extern int local_apic_timer_c2_ok; | 41 | extern int local_apic_timer_c2_ok; |
42 | 42 | ||
43 | extern int ioapic_force; | ||
44 | |||
45 | extern int disable_apic; | 43 | extern int disable_apic; |
46 | /* | 44 | /* |
47 | * Basic functions accessing APICs. | 45 | * Basic functions accessing APICs. |