From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 21:47:10 +0000 (+0100)
Subject: [PATCH] x86_64: Don't confuse noapic with noapictimer
X-Git-Tag: v2.6.16-rc1~285
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d9cb75f2f41788a59bcd3dac30b264a4bebaf2e;p=linux-2.6

[PATCH] x86_64: Don't confuse noapic with noapictimer

Handling common prefixes is tricky.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index cc25fa6bc9..28895c03cb 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -343,7 +343,9 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 		    !memcmp(from, "disableapic", 11))
 			disable_apic = 1;
 
-		if (!memcmp(from, "noapic", 6)) 
+		/* Don't confuse with noapictimer */
+		if (!memcmp(from, "noapic", 6) &&
+			(from[6] == ' ' || from[6] == 0))
 			skip_ioapic_setup = 1;
 
 		/* Make sure to not confuse with apic= */