[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>

authored by Andi Kleen and committed by Linus Torvalds 0d9cb75f 256ddb01

+3 -1
+3 -1
arch/x86_64/kernel/setup.c
··· 343 343 !memcmp(from, "disableapic", 11)) 344 344 disable_apic = 1; 345 345 346 - if (!memcmp(from, "noapic", 6)) 346 + /* Don't confuse with noapictimer */ 347 + if (!memcmp(from, "noapic", 6) && 348 + (from[6] == ' ' || from[6] == 0)) 347 349 skip_ioapic_setup = 1; 348 350 349 351 /* Make sure to not confuse with apic= */