---

yaml --- r: 175454 b: refs/heads/master c: a946d8f h: refs/heads/master v: v3
git-mirror · Dec 7, 2009 · 432626f · 432626f
1 parent a38c2f6
commit 432626f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3d607c6b39bd9cb5000e03e2c0dc2afe1241374
+refs/heads/master: a946d8f11f0da9cfc714248036fcfd3a794d1e27
diff --git a/trunk/arch/x86/kernel/apic/apic_noop.c b/trunk/arch/x86/kernel/apic/apic_noop.c
@@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg)
 
 static void noop_apic_write(u32 reg, u32 v)
 {
-	WARN_ON_ONCE((cpu_has_apic || !disable_apic));
+	WARN_ON_ONCE(cpu_has_apic && !disable_apic);
 }
 
 struct apic apic_noop = {