]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mtrr: fix UP breakage caused during switch to stop_machine
authorTejun Heo <tj@kernel.org>
Thu, 25 Aug 2011 17:46:56 +0000 (19:46 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Aug 2011 18:02:29 +0000 (11:02 -0700)
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>
arch/x86/kernel/cpu/mtrr/main.c

index 08119a37e53c1f11b044ce5c865c7ad9339c4fd0..6b96110bb0c33078bdc05de2b727fc5bcb03eb71 100644 (file)
@@ -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;
 }