diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 06:35:53 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 03:35:46 -0400 |
commit | 736decac643e8982655e22ac7f0e5e61c5b7f9bd (patch) | |
tree | 779e2a12713a27de723b0f600a13c746aa4615ad /arch/x86/kernel/smpboot.c | |
parent | f1d7062a235d057e5d85ed2860bef609e0160cde (diff) |
x86: Move percpu clockevents setup to x86_init_ops
paravirt overrides the setup of the default apic timers as per cpu
timers. Moorestown needs to override that as well.
Move it to x86_init_ops setup and create a separate x86_cpuinit struct
which holds the function for the secondary evtl. hotplugabble CPUs.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 2fecda69ee64..6eb81a87b4b7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -323,7 +323,7 @@ notrace static void __cpuinit start_secondary(void *unused) | |||
323 | /* enable local interrupts */ | 323 | /* enable local interrupts */ |
324 | local_irq_enable(); | 324 | local_irq_enable(); |
325 | 325 | ||
326 | setup_secondary_clock(); | 326 | x86_cpuinit.setup_percpu_clockev(); |
327 | 327 | ||
328 | wmb(); | 328 | wmb(); |
329 | cpu_idle(); | 329 | cpu_idle(); |
@@ -1112,7 +1112,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1112 | 1112 | ||
1113 | printk(KERN_INFO "CPU%d: ", 0); | 1113 | printk(KERN_INFO "CPU%d: ", 0); |
1114 | print_cpu_info(&cpu_data(0)); | 1114 | print_cpu_info(&cpu_data(0)); |
1115 | setup_boot_clock(); | 1115 | x86_init.timers.setup_percpu_clockev(); |
1116 | 1116 | ||
1117 | if (is_uv_system()) | 1117 | if (is_uv_system()) |
1118 | uv_system_init(); | 1118 | uv_system_init(); |