summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-01-15 21:22:45 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2015-01-22 14:10:56 (GMT)
commit9c4d9c73dd380ecfe1893600174f96d0eb068997 (patch)
tree34af7b4685ce7bead6e180132e2a2e99e6436bd0 /arch/x86/kernel/smpboot.c
parent374aab339f10f0510cec0e79d752d31d84b08aa2 (diff)
downloadlinux-9c4d9c73dd380ecfe1893600174f96d0eb068997.tar.xz
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 <tglx@linutronix.de> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/20150115211704.162567839@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c4
1 files changed, 0 insertions, 4 deletions
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();