git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
apic.c
diff --git
a/arch/x86/kernel/apic/apic.c
b/arch/x86/kernel/apic/apic.c
index
8c7c042
..
0a1c283
100644
(file)
--- a/
arch/x86/kernel/apic/apic.c
+++ b/
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;
#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()) {
static __init int setup_nox2apic(char *str)
{
if (x2apic_enabled()) {
@@
-149,7
+148,6
@@
static __init int setup_nox2apic(char *str)
return 0;
}
return 0;
}
- disable_x2apic = 1;
setup_clear_cpu_cap(X86_FEATURE_X2APIC);
return 0;
}
setup_clear_cpu_cap(X86_FEATURE_X2APIC);
return 0;
}