Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66bcaf0b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move irq_init to x86_init_ops 



irq_init is overridden by x86_quirks and by paravirts. Unify the whole
mess and make it an unconditional x86_init_ops function which defaults
to the standard function and can be overridden by the early platform
code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d9112f43

arch/x86/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ extern void fixup_irqs(void); 
#endif



extern void (*generic_interrupt_extension)(void);

extern void init_IRQ(void);

extern void native_init_IRQ(void);

extern bool handle_irq(unsigned irq, struct pt_regs *regs);

arch/x86/include/asm/paravirt_types.h

+0 −2
Original line number Diff line number Diff line
@@ -201,8 +201,6 @@ struct pv_cpu_ops { 
};



struct pv_irq_ops {

	void (*init_IRQ)(void);



	/*

	 * Get/set interrupt state.  save_fl and restore_fl are only

	 * expected to use X86_EFLAGS_IF; all other bits

arch/x86/include/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 
struct x86_quirks {

	int (*arch_pre_time_init)(void);

	int (*arch_time_init)(void);

	int (*arch_intr_init)(void);

	int (*arch_trap_init)(void);

};



extern void x86_quirk_intr_init(void);



extern void x86_quirk_trap_init(void);



extern void x86_quirk_pre_time_init(void);

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ struct x86_init_resources { 
 * struct x86_init_irqs - platform specific interrupt setup

 * @pre_vector_init:		init code to run before interrupt vectors

 *				are set up.

 * @intr_init:			interrupt init code

 */

struct x86_init_irqs {

	void (*pre_vector_init)(void);

	void (*intr_init)(void);

};



/**

arch/x86/kernel/apic/numaq_32.c

+0 −1
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static void __init smp_read_mpc_oem(struct mpc_table *mpc) 
static struct x86_quirks numaq_x86_quirks __initdata = {

	.arch_pre_time_init		= numaq_pre_time_init,

	.arch_time_init			= NULL,

	.arch_intr_init			= NULL,

	.arch_trap_init			= NULL,

};