From edbd0500f86f1ceeb3d641d9af771b7fcf341572 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 22:42:57 +0100
Subject: [PATCH] --- yaml --- r: 17937 b: refs/heads/master c:
 ed8388a5d9db0445322f86ee8381b0f04a2057ee h: refs/heads/master i:   17935:
 e08bbf1743570efd07ca0ceb2259b741bb63596f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/setup.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f8f2502a7c9..5bf2a43167cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c0ac555b0b927ee0b3ca6200617f43dbdbaffb8
+refs/heads/master: ed8388a5d9db0445322f86ee8381b0f04a2057ee
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index ee3a5cd7d8d9..33e77ec8da22 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -351,7 +351,9 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 		if (!memcmp(from, "noapic", 6)) 
 			skip_ioapic_setup = 1;
 
-		if (!memcmp(from, "apic", 4)) { 
+		/* Make sure to not confuse with apic= */
+		if (!memcmp(from, "apic", 4) &&
+			(from[4] == ' ' || from[4] == 0)) {
 			skip_ioapic_setup = 0;
 			ioapic_force = 1;
 		}