From f0d063998104819730bab677a18958982680d432 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 7 Apr 2006 19:49:42 +0200
Subject: [PATCH] --- yaml --- r: 25329 b: refs/heads/master c:
 d1530d82e02fd96d4634a6d6f6538c8b778c43af h: refs/heads/master i:   25327:
 03b4815f57e4f2e62633e0cd7503d5d5ef7a6e95 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 fa7d53d404c6..df342db03896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3b6a349d233aecf2c52f7f4c150ca09f684f2d8
+refs/heads/master: d1530d82e02fd96d4634a6d6f6538c8b778c43af
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 0856ad444f90..c50b06765a80 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -353,8 +353,10 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 		if (fullarg(from, "enable_timer_pin_1"))
 			disable_timer_pin_1 = -1;
 
-		if (fullarg(from, "nolapic") || fullarg(from, "disableapic"))
+		if (fullarg(from, "nolapic") || fullarg(from, "disableapic")) {
+			clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
 			disable_apic = 1;
+		}
 
 		if (fullarg(from, "noapic"))
 			skip_ioapic_setup = 1;