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();
 
         /*