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