diff --git a/[refs] b/[refs]
index 3f1ad0409c8c..e4e639feb3db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11826385b63566d98c02d35f592232ee77cd791
+refs/heads/master: a08c4743ed5b861c4fa3d75be00da7106c926296
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index c3dd64fabcf3..38d6aab2358d 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/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();
 
 	/*