diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-12 17:04:23 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 17:04:23 -0400 |
commit | 9f75e9b74a45d7d3c343c8979f49d5e6b92bbce3 (patch) | |
tree | ca7115bd03031db131dda5912e2d9cd302046608 /arch/x86/kernel/time_64.c | |
parent | 2f0798a3b1c2155b8f30858e853557aef9da2e4e (diff) |
x86_64: remove now unused code
Remove the unused code after the switch to clock events.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/time_64.c')
-rw-r--r-- | arch/x86/kernel/time_64.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index aca081c37884..e0134d6c88da 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c | |||
@@ -150,48 +150,6 @@ int update_persistent_clock(struct timespec now) | |||
150 | return set_rtc_mmss(now.tv_sec); | 150 | return set_rtc_mmss(now.tv_sec); |
151 | } | 151 | } |
152 | 152 | ||
153 | void main_timer_handler(void) | ||
154 | { | ||
155 | /* | ||
156 | * Here we are in the timer irq handler. We have irqs locally disabled (so we | ||
157 | * don't need spin_lock_irqsave()) but we don't know if the timer_bh is running | ||
158 | * on the other CPU, so we need a lock. We also need to lock the vsyscall | ||
159 | * variables, because both do_timer() and us change them -arca+vojtech | ||
160 | */ | ||
161 | |||
162 | write_seqlock(&xtime_lock); | ||
163 | |||
164 | /* | ||
165 | * Do the timer stuff. | ||
166 | */ | ||
167 | |||
168 | do_timer(1); | ||
169 | #ifndef CONFIG_SMP | ||
170 | update_process_times(user_mode(get_irq_regs())); | ||
171 | #endif | ||
172 | |||
173 | /* | ||
174 | * In the SMP case we use the local APIC timer interrupt to do the profiling, | ||
175 | * except when we simulate SMP mode on a uniprocessor system, in that case we | ||
176 | * have to call the local interrupt handler. | ||
177 | */ | ||
178 | |||
179 | if (!using_apic_timer) | ||
180 | smp_local_timer_interrupt(); | ||
181 | |||
182 | write_sequnlock(&xtime_lock); | ||
183 | } | ||
184 | |||
185 | static irqreturn_t timer_interrupt(int irq, void *dev_id) | ||
186 | { | ||
187 | if (apic_runs_main_timer > 1) | ||
188 | return IRQ_HANDLED; | ||
189 | main_timer_handler(); | ||
190 | if (using_apic_timer) | ||
191 | smp_send_timer_broadcast_ipi(); | ||
192 | return IRQ_HANDLED; | ||
193 | } | ||
194 | |||
195 | static irqreturn_t timer_event_interrupt(int irq, void *dev_id) | 153 | static irqreturn_t timer_event_interrupt(int irq, void *dev_id) |
196 | { | 154 | { |
197 | add_pda(irq0_irqs, 1); | 155 | add_pda(irq0_irqs, 1); |