diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 11:10:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 11:10:42 +0200 |
| commit | ea1c9de45ecb162841c9b4e0fa303a245d59b1c8 (patch) | |
| tree | 72ef1624d8a4c581ad94a84f38f941682562030b /arch/x86/kernel/smpboot.c | |
| parent | arch/x86/kernel/apm_32.c: remove duplicated #include (diff) | |
| parent | x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3 (diff) | |
| download | linux-ea1c9de45ecb162841c9b4e0fa303a245d59b1c8.tar.xz linux-ea1c9de45ecb162841c9b4e0fa303a245d59b1c8.zip | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 18a2350deacd..cf73b06323da 100644 --- 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(); } |