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

Commit 428cf902 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move traps_init to x86_init_ops 



Replace the quirks by a simple x86_init_ops function.

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

arch/x86/include/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -16,11 +16,8 @@ 
struct x86_quirks {

	int (*arch_pre_time_init)(void);

	int (*arch_time_init)(void);

	int (*arch_trap_init)(void);

};



extern void x86_quirk_trap_init(void);



extern void x86_quirk_pre_time_init(void);

extern void x86_quirk_time_init(void);

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -48,10 +48,12 @@ struct x86_init_resources { 
 * @pre_vector_init:		init code to run before interrupt vectors

 *				are set up.

 * @intr_init:			interrupt init code

 * @trap_init:			platform specific trap setup

 */

struct x86_init_irqs {

	void (*pre_vector_init)(void);

	void (*intr_init)(void);

	void (*trap_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_trap_init			= NULL,

};



static __init void early_check_numaq(void)

arch/x86/kernel/setup.c

+0 −15
Original line number Diff line number Diff line
@@ -1020,21 +1020,6 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_X86_32



/**

 * x86_quirk_trap_init - initialise system specific traps

 *

 * Description:

 *	Called as the final act of trap_init().  Used in VISWS to initialise

 *	the various board specific APIC traps.

 **/

void __init x86_quirk_trap_init(void)

{

	if (x86_quirks->arch_trap_init) {

		if (x86_quirks->arch_trap_init())

			return;

	}

}



static struct irqaction irq0  = {

	.handler = timer_interrupt,

	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,

arch/x86/kernel/traps.c

+2 −3
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <asm/mach_traps.h>



#ifdef CONFIG_X86_64

#include <asm/x86_init.h>

#include <asm/pgalloc.h>

#include <asm/proto.h>

#else
@@ -980,7 +981,5 @@ void __init trap_init(void) 
	 */

	cpu_init();



#ifdef CONFIG_X86_32

	x86_quirk_trap_init();

#endif

	x86_init.irqs.trap_init();

}