[PATCH] x86_64: Don't confuse apic=... command line option with apic

Previously apic was foced with apic=logopt was specified. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
git-mirror · Jan 12, 2006 · ed8388a · ed8388a
1 parent 7c0ac55
commit ed8388a
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
@@ -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;
 		}