diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 15:28:50 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 09:35:46 +0200 |
| commit | ecce85089e6d31eed7535b68f5acdd194265690c (patch) | |
| tree | 40f9b059ffa0211f6409e326d7198ec24d7e1944 /arch | |
| parent | 845b3944bbdf9e9247849bf037f27ff3a3f26d87 (diff) | |
| download | linux-ecce85089e6d31eed7535b68f5acdd194265690c.tar.gz linux-ecce85089e6d31eed7535b68f5acdd194265690c.tar.bz2 linux-ecce85089e6d31eed7535b68f5acdd194265690c.zip | |
x86: Remove do_timer hook
This is a left over of the old x86 sub arch support. Remove it and
open code it like we do in time_64.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/do_timer.h | 16 | ||||
| -rw-r--r-- | arch/x86/kernel/time_32.c | 7 |
2 files changed, 4 insertions, 19 deletions
diff --git a/arch/x86/include/asm/do_timer.h b/arch/x86/include/asm/do_timer.h deleted file mode 100644 index 23ecda0b28a0..000000000000 --- a/arch/x86/include/asm/do_timer.h +++ /dev/null @@ -1,16 +0,0 @@ -/* defines for inline arch setup functions */ -#include <linux/clockchips.h> - -#include <asm/i8259.h> -#include <asm/i8253.h> - -/** - * do_timer_interrupt_hook - hook into timer tick - * - * Call the pit clock event handler. see asm/i8253.h - **/ - -static inline void do_timer_interrupt_hook(void) -{ - global_clock_event->event_handler(global_clock_event); -} diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 89bbb52218b8..6fef4ea1e7a6 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c @@ -28,6 +28,7 @@ * serialize accesses to xtime/lost_ticks). */ +#include <linux/clockchips.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/time.h> @@ -37,8 +38,8 @@ #include <asm/hpet.h> #include <asm/time.h> #include <asm/timer.h> - -#include <asm/do_timer.h> +#include <asm/i8259.h> +#include <asm/i8253.h> int timer_ack; @@ -92,7 +93,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) } #endif - do_timer_interrupt_hook(); + global_clock_event->event_handler(global_clock_event); #ifdef CONFIG_MCA if (MCA_bus) { |