Commit 0d9cb75f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

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

Handling common prefixes is tricky.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 256ddb01
...@@ -343,7 +343,9 @@ static __init void parse_cmdline_early (char ** cmdline_p) ...@@ -343,7 +343,9 @@ static __init void parse_cmdline_early (char ** cmdline_p)
!memcmp(from, "disableapic", 11)) !memcmp(from, "disableapic", 11))
disable_apic = 1; 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; skip_ioapic_setup = 1;
/* Make sure to not confuse with apic= */ /* Make sure to not confuse with apic= */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment