x86_64: Don't call mtrr_bp_init from identify_cpu

The code was ok, but triggered warnings for calling __init from
__cpuinit. Instead call it from check_bugs instead.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86_64/kernel/bugs.c
index 12b585b5345d..c141e7a7ff55 100644
--- a/arch/x86_64/kernel/bugs.c
+++ b/arch/x86_64/kernel/bugs.c
@@ -13,6 +13,7 @@
 void __init check_bugs(void)
 {
         identify_cpu(&boot_cpu_data);
+        mtrr_bp_init();
 #if !defined(CONFIG_SMP)
         printk("CPU: ");
         print_cpu_info(&boot_cpu_data);
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index db51577bda32..eb6524f3ac29 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -891,9 +891,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 #ifdef CONFIG_X86_MCE
         mcheck_init(c);
 #endif
-        if (c == &boot_cpu_data)
-                mtrr_bp_init();
-        else
+        if (c != &boot_cpu_data)
                 mtrr_ap_init();
 #ifdef CONFIG_NUMA
         numa_add_cpu(smp_processor_id());