Commit 8bd99481 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 547c5355
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
void __init check_bugs(void) void __init check_bugs(void)
{ {
identify_cpu(&boot_cpu_data); identify_cpu(&boot_cpu_data);
mtrr_bp_init();
#if !defined(CONFIG_SMP) #if !defined(CONFIG_SMP)
printk("CPU: "); printk("CPU: ");
print_cpu_info(&boot_cpu_data); print_cpu_info(&boot_cpu_data);
......
...@@ -891,9 +891,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) ...@@ -891,9 +891,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
mcheck_init(c); mcheck_init(c);
#endif #endif
if (c == &boot_cpu_data) if (c != &boot_cpu_data)
mtrr_bp_init();
else
mtrr_ap_init(); mtrr_ap_init();
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
numa_add_cpu(smp_processor_id()); numa_add_cpu(smp_processor_id());
......
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