x86: refactor x86_quirks support (8e6dafd6) · Commits · 戴 / test

arch/x86/include/asm/arch_hooks.h

deleted100644 → 0

+0 −26

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_ARCH_HOOKS_H
	#define _ASM_X86_ARCH_HOOKS_H

	#include <linux/interrupt.h>

	/*
	* linux/include/asm/arch_hooks.h
	*
	* define the architecture specific hooks
	*/

	/* these aren't arch hooks, they are generic routines
	* that can be used by the hooks */
	extern void init_ISA_irqs(void);
	extern irqreturn_t timer_interrupt(int irq, void *dev_id);

	/* these are the defined hooks */
	extern void pre_intr_init_hook(void);
	extern void intr_init_hook(void);

	extern void trap_init_hook(void);

	extern void pre_time_init_hook(void);
	extern void time_init_hook(void);

	#endif /* _ASM_X86_ARCH_HOOKS_H */

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,4 +60,8 @@ extern struct irq_chip i8259A_chip;
	extern void mask_8259A(void);		extern void mask_8259A(void);
	extern void unmask_8259A(void);		extern void unmask_8259A(void);

			#ifdef CONFIG_X86_32
			extern void init_ISA_irqs(void);
			#endif

	#endif /* _ASM_X86_I8259_H */		#endif /* _ASM_X86_I8259_H */

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@
	struct mpc_cpu;		struct mpc_cpu;
	struct mpc_bus;		struct mpc_bus;
	struct mpc_oemtable;		struct mpc_oemtable;

	struct x86_quirks {		struct x86_quirks {
	int (*arch_pre_time_init)(void);		int (*arch_pre_time_init)(void);
	int (*arch_time_init)(void);		int (*arch_time_init)(void);
	@@ -33,6 +34,14 @@ struct x86_quirks {
	int (*update_apic)(void);		int (*update_apic)(void);
	};		};

			extern void x86_quirk_pre_intr_init(void);
			extern void x86_quirk_intr_init(void);

			extern void x86_quirk_trap_init(void);

			extern void x86_quirk_pre_time_init(void);
			extern void x86_quirk_time_init(void);

	#endif /* __ASSEMBLY__ */		#endif /* __ASSEMBLY__ */

	#ifdef __i386__		#ifdef __i386__

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/pm.h>		#include <linux/pm.h>
	#include <linux/percpu.h>		#include <linux/percpu.h>
			#include <linux/interrupt.h>

	#define TICK_SIZE (tick_nsec / 1000)		#define TICK_SIZE (tick_nsec / 1000)

	@@ -12,6 +13,7 @@ unsigned long native_calibrate_tsc(void);
	#ifdef CONFIG_X86_32		#ifdef CONFIG_X86_32
	extern int timer_ack;		extern int timer_ack;
	extern int recalibrate_cpu_khz(void);		extern int recalibrate_cpu_khz(void);
			extern irqreturn_t timer_interrupt(int irq, void *dev_id);
	#endif /* CONFIG_X86_32 */		#endif /* CONFIG_X86_32 */

	extern int no_timer_check;		extern int no_timer_check;

+0 −1