diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 21:22:45 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 15:10:56 +0100 |
| commit | 9c4d9c73dd380ecfe1893600174f96d0eb068997 (patch) | |
| tree | 34af7b4685ce7bead6e180132e2a2e99e6436bd0 /arch/x86/kernel/apic | |
| parent | 374aab339f10f0510cec0e79d752d31d84b08aa2 (diff) | |
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/apic')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 437c35bdddc8..b665d241efad 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; } |