From 432626f1ae2d166336e80bebdf815c85c353267d Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 7 Dec 2009 12:59:46 +0100
Subject: [PATCH] --- yaml --- r: 175454 b: refs/heads/master c:
 a946d8f11f0da9cfc714248036fcfd3a794d1e27 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/apic/apic_noop.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 83ddc8fee3d7..b12b4d0616fe 100644
--- 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
index d9acc3bee0f4..e31b9ffe25f5 100644
--- 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 = {