path: root/arch/x86/kernel
diff options
authorTejun Heo <tj@kernel.org>2011-08-25 19:46:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-25 11:02:29 -0700
commitcbbfa38fcb95930babc5233cf6927ec430f38abc (patch)
tree62e904e7f17efcda16f9a8afd15a6a84f06cec0e /arch/x86/kernel
parente096d0c7e2e4e5893792db865dd065ac73cf1f00 (diff)
mtrr: fix UP breakage caused during switch to stop_machine
While removing custom rendezvous code and switching to stop_machine, commit 192d8857427d ("x86, mtrr: use stop_machine APIs for doing MTRR rendezvous") completely dropped mtrr setting code on !CONFIG_SMP breaking MTRR settting on UP. Fix it by removing the incorrect CONFIG_SMP. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Anders Eriksson <aeriksson@fastmail.fm> Tested-and-acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel')
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 08119a37e53c..6b96110bb0c3 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -149,7 +149,6 @@ struct set_mtrr_data {
static int mtrr_rendezvous_handler(void *info)
-#ifdef CONFIG_SMP
struct set_mtrr_data *data = info;
@@ -171,7 +170,6 @@ static int mtrr_rendezvous_handler(void *info)
} else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
return 0;

Privacy Policy