From 03e38beacff8a3408c5fb811082a07e5db7da358 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 11 Jan 2006 22:47:10 +0100 Subject: [PATCH] --- yaml --- r: 18021 b: refs/heads/master c: 0d9cb75f2f41788a59bcd3dac30b264a4bebaf2e h: refs/heads/master i: 18019: 5f1d0b6b476f87f0c157ad458075a02d8e9a838f v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e749d867755d..1d950308cca8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 256ddb01ebdcb065f81487fff00be833192d8764 +refs/heads/master: 0d9cb75f2f41788a59bcd3dac30b264a4bebaf2e diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index cc25fa6bc975..28895c03cb11 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/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= */