aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-05-11 11:23:20 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 12:53:00 -0700
commit8bd994815987dda0947bd9afd887b1410713d4f7 (patch)
treeb453238c4f2a14b557db0568e6ada733e5310ecd /arch/x86_64/kernel
parent547c5355d1b1167af39e315c82aa9ff1398596f4 (diff)
downloadkernel_samsung_espresso10-8bd994815987dda0947bd9afd887b1410713d4f7.zip
kernel_samsung_espresso10-8bd994815987dda0947bd9afd887b1410713d4f7.tar.gz
kernel_samsung_espresso10-8bd994815987dda0947bd9afd887b1410713d4f7.tar.bz2
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>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/bugs.c1
-rw-r--r--arch/x86_64/kernel/setup.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86_64/kernel/bugs.c
index 12b585b..c141e7a 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 db51577..eb6524f 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());