git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86: apic - unify lapic_shutdown
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
apic_32.c
diff --git
a/arch/x86/kernel/apic_32.c
b/arch/x86/kernel/apic_32.c
index
13c4b79
..
d4efe86
100644
(file)
--- a/
arch/x86/kernel/apic_32.c
+++ b/
arch/x86/kernel/apic_32.c
@@
-838,10
+838,13
@@
void lapic_shutdown(void)
local_irq_save(flags);
- if (enabled_via_apicbase)
- disable_local_APIC();
- else
+#ifdef CONFIG_X86_32
+ if (!enabled_via_apicbase)
clear_local_APIC();
+ else
+#endif
+ disable_local_APIC();
+
local_irq_restore(flags);
}