Commit ecce8508 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 845b3944

arch/x86/include/asm/do_timer.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* 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);

}

arch/x86/kernel/time_32.c

+4 −3
Original line number Diff line number Diff line
@@ -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) {