Now that the APIC bringup is consolidated we can move the setup call for the percpu clock event device to apic_bsp_setup(). Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/smpboot.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) Index: tip/arch/x86/kernel/apic/apic.c =================================================================== --- tip.orig/arch/x86/kernel/apic/apic.c +++ tip/arch/x86/kernel/apic/apic.c @@ -2243,6 +2243,8 @@ int __init apic_bsp_setup(bool upmode) end_local_APIC_setup(); irq_remap_enable_fault_handling(); setup_IO_APIC(); + /* Setup local timer */ + x86_init.timers.setup_percpu_clockev(); return id; } @@ -2283,8 +2285,6 @@ int __init APIC_init_uniprocessor(void) default_setup_apic_routing(); verify_local_APIC(); apic_bsp_setup(true); - - x86_init.timers.setup_percpu_clockev(); return 0; } #ifndef CONFIG_SMP Index: tip/arch/x86/kernel/smpboot.c =================================================================== --- tip.orig/arch/x86/kernel/smpboot.c +++ tip/arch/x86/kernel/smpboot.c @@ -1163,12 +1163,8 @@ void __init native_smp_prepare_cpus(unsi cpu0_logical_apicid = apic_bsp_setup(false); - /* - * Set up local APIC timer on boot CPU. - */ pr_info("CPU%d: ", 0); print_cpu_info(&cpu_data(0)); - x86_init.timers.setup_percpu_clockev(); if (is_uv_system()) uv_system_init();