Merge branch 'x86/urgent' into x86/cleanups

2008-08-25 11:10:42 +02:00
parent 4e1d112cac a2bd7274b4
commit ea1c9de45e
29 changed files with 307 additions and 118 deletions
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1221,6 +1221,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 	printk(KERN_INFO "CPU%d: ", 0);
 	print_cpu_info(&cpu_data(0));
 	setup_boot_clock();
+
+	if (is_uv_system())
+		uv_system_init();
 out:
 	preempt_enable();
 }