[PATCH] x86_64: Don't confuse apic=... command line option with apic
authorAndi Kleen <ak@suse.de>
Wed, 11 Jan 2006 21:42:57 +0000 (22:42 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 03:01:13 +0000 (19:01 -0800)
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>
arch/x86_64/kernel/setup.c

index ee3a5cd7d8d9d48d8825a0268d279fb679b7635a..33e77ec8da22f797a447dd33adfd1d7ec50e9abf 100644 (file)
@@ -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;
                }