From: Chris Wright Remove pit_interrupt_hook as it adds just an extra layer. Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- include/asm-i386/i8253.h | 11 ----------- include/asm-i386/mach-default/do_timer.h | 2 +- include/asm-i386/mach-voyager/do_timer.h | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) Index: linux-2.6.22-rc6-mm/include/asm-i386/i8253.h =================================================================== --- linux-2.6.22-rc6-mm.orig/include/asm-i386/i8253.h 2007-07-15 09:37:52.000000000 +0200 +++ linux-2.6.22-rc6-mm/include/asm-i386/i8253.h 2007-07-15 17:49:01.000000000 +0200 @@ -12,17 +12,6 @@ extern spinlock_t i8253_lock; extern struct clock_event_device *global_clock_event; -/** - * pit_interrupt_hook - hook into timer tick - * @regs: standard registers from interrupt - * - * Call the global clock event handler. - **/ -static inline void pit_interrupt_hook(void) -{ - global_clock_event->event_handler(global_clock_event); -} - extern void setup_pit_timer(void); #endif /* __ASM_I8253_H__ */ Index: linux-2.6.22-rc6-mm/include/asm-i386/mach-default/do_timer.h =================================================================== --- linux-2.6.22-rc6-mm.orig/include/asm-i386/mach-default/do_timer.h 2007-04-26 05:08:32.000000000 +0200 +++ linux-2.6.22-rc6-mm/include/asm-i386/mach-default/do_timer.h 2007-07-15 09:44:10.000000000 +0200 @@ -12,5 +12,5 @@ static inline void do_timer_interrupt_hook(void) { - pit_interrupt_hook(); + global_clock_event->event_handler(global_clock_event); } Index: linux-2.6.22-rc6-mm/include/asm-i386/mach-voyager/do_timer.h =================================================================== --- linux-2.6.22-rc6-mm.orig/include/asm-i386/mach-voyager/do_timer.h 2007-04-26 05:08:32.000000000 +0200 +++ linux-2.6.22-rc6-mm/include/asm-i386/mach-voyager/do_timer.h 2007-07-15 09:44:10.000000000 +0200 @@ -12,7 +12,7 @@ **/ static inline void do_timer_interrupt_hook(void) { - pit_interrupt_hook(); + global_clock_event->event_handler(global_clock_event); voyager_timer_interrupt(); } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/