evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: Consolidate boot cpu timer setup

Browse source 
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>
This commit is contained in:
Thomas Gleixner 2015-01-15 21:22:45 +00:00
parent 374aab339f
commit 9c4d9c73dd
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/apic/apic.c
View file

@ -2244,6 +2244,8 @@ int __init apic_bsp_setup(bool upmode)
end_local_APIC_setup(); end_local_APIC_setup();
irq_remap_enable_fault_handling(); irq_remap_enable_fault_handling();
setup_IO_APIC(); setup_IO_APIC();
/* Setup local timer */
x86_init.timers.setup_percpu_clockev();
return id; return id;
} }
@ -2284,8 +2286,6 @@ int __init APIC_init_uniprocessor(void)
default_setup_apic_routing(); default_setup_apic_routing();
verify_local_APIC(); verify_local_APIC();
apic_bsp_setup(true); apic_bsp_setup(true);
x86_init.timers.setup_percpu_clockev();
return 0; return 0;
} }

4
arch/x86/kernel/smpboot.c
View file

@ -1163,12 +1163,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
cpu0_logical_apicid = apic_bsp_setup(false); cpu0_logical_apicid = apic_bsp_setup(false);
/*
* Set up local APIC timer on boot CPU.
*/
pr_info("CPU%d: ", 0); pr_info("CPU%d: ", 0);
print_cpu_info(&cpu_data(0)); print_cpu_info(&cpu_data(0));
x86_init.timers.setup_percpu_clockev();
if (is_uv_system()) if (is_uv_system())
uv_system_init(); uv_system_init();