Commit cbbfa38f authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds

mtrr: fix UP breakage caused during switch to stop_machine

While removing custom rendezvous code and switching to stop_machine,
commit 192d8857 ("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: default avatarTejun Heo <>
Reported-by: default avatarAnders Eriksson <>
Tested-and-acked-by: default avatarSuresh Siddha <>
Acked-by: default avatarH. Peter Anvin <>
Signed-off-by: default avatarLinus Torvalds <>
parent e096d0c7
......@@ -149,7 +149,6 @@ struct set_mtrr_data {
static int mtrr_rendezvous_handler(void *info)
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment