diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-09-06 18:17:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:32 -0400 |
commit | 7f4bde9a3486cd7e70bedd2aff35b38667d50173 (patch) | |
tree | 594ef79e14e787196099985e58a9d6563659508d /arch/i386/kernel | |
parent | 2832e9366a1fcd6f76957a42157be041240f994e (diff) |
[PATCH] remove the second arg of do_timer_interrupt()
The second arg of do_timer_interrupt() is not used in the functions, and
all callers pass NULL.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Paul Mundt <lethal@Linux-SH.ORG>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r-- | arch/i386/kernel/time.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index b0c5ee2b3446..9b94d84a6c3b 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c | |||
@@ -252,8 +252,7 @@ EXPORT_SYMBOL(profile_pc); | |||
252 | * timer_interrupt() needs to keep up the real-time clock, | 252 | * timer_interrupt() needs to keep up the real-time clock, |
253 | * as well as call the "do_timer()" routine every clocktick | 253 | * as well as call the "do_timer()" routine every clocktick |
254 | */ | 254 | */ |
255 | static inline void do_timer_interrupt(int irq, void *dev_id, | 255 | static inline void do_timer_interrupt(int irq, struct pt_regs *regs) |
256 | struct pt_regs *regs) | ||
257 | { | 256 | { |
258 | #ifdef CONFIG_X86_IO_APIC | 257 | #ifdef CONFIG_X86_IO_APIC |
259 | if (timer_ack) { | 258 | if (timer_ack) { |
@@ -307,7 +306,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
307 | 306 | ||
308 | cur_timer->mark_offset(); | 307 | cur_timer->mark_offset(); |
309 | 308 | ||
310 | do_timer_interrupt(irq, NULL, regs); | 309 | do_timer_interrupt(irq, regs); |
311 | 310 | ||
312 | write_sequnlock(&xtime_lock); | 311 | write_sequnlock(&xtime_lock); |
313 | return IRQ_HANDLED; | 312 | return IRQ_HANDLED; |