1 files changed, 5 insertions, 8 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a25eeec00080..565ebc65920e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -324,7 +324,7 @@ notrace static void __cpuinit start_secondary(void *unused)
         /* enable local interrupts */
         local_irq_enable();
 
-        setup_secondary_clock();
+        x86_cpuinit.setup_percpu_clockev();
 
         wmb();
         cpu_idle();
@@ -1059,12 +1059,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 #endif
         current_thread_info()->cpu = 0;  /* needed? */
         for_each_possible_cpu(i) {
-                alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
-                alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
-                alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
-                cpumask_clear(per_cpu(cpu_core_map, i));
-                cpumask_clear(per_cpu(cpu_sibling_map, i));
-                cpumask_clear(cpu_data(i).llc_shared_map);
+                zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
+                zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
+                zalloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
         }
         set_cpu_sibling_map(0);
 
@@ -1114,7 +1111,7 @@ 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();
+        x86_init.timers.setup_percpu_clockev();
 
         if (is_uv_system())
                 uv_system_init();