diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:08 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:00 -0400 |
commit | 8f15b82e22779fd44baeb78515c9c154b407eff0 (patch) | |
tree | 33db348e06c073a3ed1f175d4ef2dc3126c109bc /arch/x86/kernel/smpboot_32.c | |
parent | 3ff8171feecfcdee46be7d6e92259debe46ac87f (diff) |
x86: move setup_secondary_clock a little bit down in the function
This is done so we call setup_secondary_clock() in the same place x86_64
does. A separate patch for this is appearantly not needed. But clock
initialization is such a delicate thing, that it's safer to do this way
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
-rw-r--r-- | arch/x86/kernel/smpboot_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index 6c16165abf11..4e5416eb42b0 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -185,7 +185,6 @@ static void __cpuinit start_secondary(void *unused) | |||
185 | */ | 185 | */ |
186 | check_tsc_sync_target(); | 186 | check_tsc_sync_target(); |
187 | 187 | ||
188 | setup_secondary_clock(); | ||
189 | if (nmi_watchdog == NMI_IO_APIC) { | 188 | if (nmi_watchdog == NMI_IO_APIC) { |
190 | disable_8259A_irq(0); | 189 | disable_8259A_irq(0); |
191 | enable_NMI_through_LVT0(); | 190 | enable_NMI_through_LVT0(); |
@@ -214,6 +213,8 @@ static void __cpuinit start_secondary(void *unused) | |||
214 | unlock_ipi_call_lock(); | 213 | unlock_ipi_call_lock(); |
215 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; | 214 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; |
216 | 215 | ||
216 | setup_secondary_clock(); | ||
217 | |||
217 | wmb(); | 218 | wmb(); |
218 | cpu_idle(); | 219 | cpu_idle(); |
219 | } | 220 | } |