Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86_64/kernel/bugs.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86_64/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -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());