---

yaml --- r: 56037 b: refs/heads/master c: 8bd9948 h: refs/heads/master i: 56035: 5b5083d v: v3
git-mirror · May 11, 2007 · a3c5d2d · a3c5d2d
1 parent 48ee300
commit a3c5d2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547c5355d1b1167af39e315c82aa9ff1398596f4
+refs/heads/master: 8bd994815987dda0947bd9afd887b1410713d4f7
diff --git a/trunk/arch/x86_64/kernel/bugs.c b/trunk/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/trunk/arch/x86_64/kernel/setup.c b/trunk/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());