projects/linux·commit cbbfa38f

mtrr: fix UP breakage caused during switch to stop_machine

cbbfa38f · Tejun Heo <[email protected]> · 2011-08-25 19:46:56 +02:00

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 <[email protected]>
Reported-by: Anders Eriksson <[email protected]>
Tested-and-acked-by: Suresh Siddha <[email protected]>
Acked-by: H. Peter Anvin <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
cbbfa38fcb95930babc5233cf6927ec430f38abc
Parents
e096d0c7

Changes

1 files changed · +0 −2

FileStatusAddDelContent
arch/x86/kernel/cpu/mtrr/main.cmodified+0−2View file

arch/x86/kernel/cpu/mtrr/main.c

View file
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 08119a3..6b96110 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())) {
mtrr_if->set_all();
}
-#endif
return 0;
}