iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64: Don't call mtrr_bp_init from identify_cpu

Browse Source 
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>
This commit is contained in:
Andi Kleen 2007-05-11 11:23:20 +02:00 committed by Linus Torvalds
parent 547c5355d1
commit 8bd9948159
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86_64/kernel/bugs.c
View File

@ -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);

4
arch/x86_64/kernel/setup.c
View File

@ -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());