提交 cbbfa38f 编写于 作者: T Tejun Heo 提交者: 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: NTejun Heo <tj@kernel.org>
Reported-by: NAnders Eriksson <aeriksson@fastmail.fm>
Tested-and-acked-by: NSuresh Siddha <suresh.b.siddha@intel.com>
Acked-by: NH. Peter Anvin <hpa@zytor.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e096d0c7
...@@ -149,7 +149,6 @@ struct set_mtrr_data { ...@@ -149,7 +149,6 @@ struct set_mtrr_data {
*/ */
static int mtrr_rendezvous_handler(void *info) static int mtrr_rendezvous_handler(void *info)
{ {
#ifdef CONFIG_SMP
struct set_mtrr_data *data = info; struct set_mtrr_data *data = info;
/* /*
...@@ -171,7 +170,6 @@ static int mtrr_rendezvous_handler(void *info) ...@@ -171,7 +170,6 @@ static int mtrr_rendezvous_handler(void *info)
} else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) { } else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
mtrr_if->set_all(); mtrr_if->set_all();
} }
#endif
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册