iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Handling common prefixes is tricky.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2006-01-11 22:47:10 +01:00 committed by Linus Torvalds
parent 256ddb01eb
commit 0d9cb75f2f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86_64/kernel/setup.c
View File

@ -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= */