diff options
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 | 
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8c7c042ecad1..0a1c2830ec66 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c  | |||
| @@ -140,7 +140,6 @@ int x2apic_mode; | |||
| 140 | #ifdef CONFIG_X86_X2APIC | 140 | #ifdef CONFIG_X86_X2APIC | 
| 141 | /* x2apic enabled before OS handover */ | 141 | /* x2apic enabled before OS handover */ | 
| 142 | static int x2apic_preenabled; | 142 | static int x2apic_preenabled; | 
| 143 | static int disable_x2apic; | ||
| 144 | static __init int setup_nox2apic(char *str) | 143 | static __init int setup_nox2apic(char *str) | 
| 145 | { | 144 | { | 
| 146 | if (x2apic_enabled()) { | 145 | if (x2apic_enabled()) { | 
| @@ -149,7 +148,6 @@ static __init int setup_nox2apic(char *str) | |||
| 149 | return 0; | 148 | return 0; | 
| 150 | } | 149 | } | 
| 151 | 150 | ||
| 152 | disable_x2apic = 1; | ||
| 153 | setup_clear_cpu_cap(X86_FEATURE_X2APIC); | 151 | setup_clear_cpu_cap(X86_FEATURE_X2APIC); | 
| 154 | return 0; | 152 | return 0; | 
| 155 | } | 153 | } | 
