diff options
| author | Andi Kleen <ak@suse.de> | 2006-01-11 22:47:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:05:04 -0800 |
| commit | 0d9cb75f2f41788a59bcd3dac30b264a4bebaf2e (patch) | |
| tree | a7e6b5a6bef3c849b95d5535e6e20858e5063038 /arch/x86_64/kernel/setup.c | |
| parent | 256ddb01ebdcb065f81487fff00be833192d8764 (diff) | |
[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>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index cc25fa6bc97..28895c03cb1 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -343,7 +343,9 @@ static __init void parse_cmdline_early (char ** cmdline_p) !memcmp(from, "disableapic", 11)) 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; /* Make sure to not confuse with apic= */ |