summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2009-01-14 15:28:51 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-15 14:04:40 +0300
commita08c4743ed5b861c4fa3d75be00da7106c926296 (patch)
tree7f9cc2a8e1edd30c499f59d90363303681ab3530
parentf11826385b63566d98c02d35f592232ee77cd791 (diff)
downloadlinux-a08c4743ed5b861c4fa3d75be00da7106c926296.tar.xz
x86: avoid early crash in disable_local_APIC()
E.g. when called due to an early panic. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/apic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index c3dd64fabcf3..38d6aab2358d 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -895,6 +895,10 @@ void disable_local_APIC(void)
{
unsigned int value;
+ /* APIC hasn't been mapped yet */
+ if (!apic_phys)
+ return;
+
clear_local_APIC();
/*