Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tejun Heo and committed by
Linus Torvalds
cbbfa38f e096d0c7

-2
-2
arch/x86/kernel/cpu/mtrr/main.c
··· 149 149 */ 150 150 static int mtrr_rendezvous_handler(void *info) 151 151 { 152 - #ifdef CONFIG_SMP 153 152 struct set_mtrr_data *data = info; 154 153 155 154 /* ··· 170 171 } else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) { 171 172 mtrr_if->set_all(); 172 173 } 173 - #endif 174 174 return 0; 175 175 } 176 176