aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2009-01-14 12:28:51 +0000
committerIngo Molnar <mingo@elte.hu>2009-01-15 23:48:19 +0100
commit4a13ad0bd8869bb491c67918662f9b1852595af5 (patch)
treeebc084ec5d23c3755ac56615cbddda1df8743b48 /arch/x86
parent5cca0cf15a94417f49625ce52e23589eed0a1675 (diff)
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>
Diffstat (limited to 'arch/x86')
-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 0f830e4f567..d19aa3aab62 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();
/*