---

yaml --- r: 136415 b: refs/heads/master c: a08c474 h: refs/heads/master i: 136413: 4a516bb 136411: f067b77 136407: ed69a61 136399: 75be3e2 136383: 77a03d9 v: v3
git-mirror · Jan 15, 2009 · 5a1e7d5 · 5a1e7d5
1 parent 84aee38
commit 5a1e7d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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();
 
 	/*