---

yaml --- r: 129949 b: refs/heads/master c: 4a13ad0 h: refs/heads/master i: 129947: e6122fb v: v3
git-mirror · Jan 15, 2009 · d1838e6 · d1838e6
1 parent 35d991a
commit d1838e6
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: 5cca0cf15a94417f49625ce52e23589eed0a1675
+refs/heads/master: 4a13ad0bd8869bb491c67918662f9b1852595af5
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();
 
 	/*