[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>
mariux64 · Jan 12, 2006 · 0d9cb75 · 0d9cb75
1 parent 256ddb0
commit 0d9cb75
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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= */