Commit-ID: 9c4d9c73dd380ecfe1893600174f96d0eb068997 Gitweb: http://git.kernel.org/tip/9c4d9c73dd380ecfe1893600174f96d0eb068997 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 15 Jan 2015 21:22:45 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 22 Jan 2015 15:10:56 +0100
x86: Consolidate boot cpu timer setup 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 <[email protected]> Cc: Jiang Liu <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Tony Luck <[email protected]> Cc: Borislav Petkov <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]> --- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/smpboot.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 437c35b..b665d24 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2244,6 +2244,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; } @@ -2284,8 +2286,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; } diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 0a46e5e..febc6aa 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1163,12 +1163,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 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(); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
