Commit d85a881d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: remove various unused subarch hooks 



Impact: remove dead code

Remove:

 - pre_setup_arch_hook()
 - mca_nmi_hook()

If needed they can be added back via an x86_quirk handler.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 965c7eca

arch/x86/include/asm/arch_hooks.h

+3 −3
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ extern void init_ISA_irqs(void); 
extern irqreturn_t timer_interrupt(int irq, void *dev_id);



/* these are the defined hooks */

extern void intr_init_hook(void);

extern void pre_intr_init_hook(void);

extern void pre_setup_arch_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);

extern void mca_nmi_hook(void);



#endif /* _ASM_X86_ARCH_HOOKS_H */

arch/x86/kernel/mca_32.c

+1 −3
Original line number Diff line number Diff line
@@ -474,6 +474,4 @@ void __kprobes mca_handle_nmi(void) 
	 * adapter was responsible for the error.

	 */

	bus_for_each_dev(&mca_bus_type, NULL, NULL, mca_handle_nmi_callback);



	mca_nmi_hook();

} /* mca_handle_nmi */
 
}

arch/x86/kernel/setup.c

+0 −34
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ void __init setup_arch(char **cmdline_p) 
#ifdef CONFIG_X86_32

	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));

	visws_early_detect();

	pre_setup_arch_hook();

#else

	printk(KERN_INFO "Command line: %s\n", boot_command_line);

#endif
@@ -1022,18 +1021,6 @@ void __init intr_init_hook(void) 
	}

}



/**

 * pre_setup_arch_hook - hook called prior to any setup_arch() execution

 *

 * Description:

 *	generally used to activate any machine specific identification

 *	routines that may be needed before setup_arch() runs.  On Voyager

 *	this is used to get the board revision and type.

 **/

void __init pre_setup_arch_hook(void)

{

}



/**

 * trap_init_hook - initialise system specific traps

 *
@@ -1088,25 +1075,4 @@ void __init time_init_hook(void) 
	irq0.mask = cpumask_of_cpu(0);

	setup_irq(0, &irq0);

}



#ifdef CONFIG_MCA

/**

 * mca_nmi_hook - hook into MCA specific NMI chain

 *

 * Description:

 *	The MCA (Microchannel Architecture) has an NMI chain for NMI sources

 *	along the MCA bus.  Use this to hook into that chain if you will need

 *	it.

 **/

void mca_nmi_hook(void)

{

	/*

	 * If I recall correctly, there's a whole bunch of other things that

	 * we can do to check for NMI problems, but that's all I know about

	 * at the moment.

	 */

	pr_warning("NMI generated from unknown source!\n");

}

#endif /* CONFIG_MCA */



#endif /* CONFIG_X86_32 */