x86, VisWS: turn into generic arch, update include/asm-x86/mach-visws/smpboot_hooks.h
update include/asm-x86/mach-visws/smpboot_hooks.h to include/asm-x86/mach-default/smpboot_hooks.h (the generic version). this _should_ work, because VISWS sets skip_ioapic_setup, but it should be tested on a real VISWS to make sure. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
6a64b5da9b
commit
244a5e2ee0
|
@ -1,3 +1,13 @@
|
||||||
|
/* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
|
||||||
|
* which needs to alter them. */
|
||||||
|
|
||||||
|
static inline void smpboot_clear_io_apic_irqs(void)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_X86_IO_APIC
|
||||||
|
io_apic_irqs = 0;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
|
static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
|
||||||
{
|
{
|
||||||
CMOS_WRITE(0xa, 0xf);
|
CMOS_WRITE(0xa, 0xf);
|
||||||
|
@ -9,20 +19,41 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
|
||||||
Dprintk("3.\n");
|
Dprintk("3.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for visws do nothing for any of these */
|
|
||||||
|
|
||||||
static inline void smpboot_clear_io_apic_irqs(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void smpboot_restore_warm_reset_vector(void)
|
static inline void smpboot_restore_warm_reset_vector(void)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
* Install writable page 0 entry to set BIOS data area.
|
||||||
|
*/
|
||||||
|
local_flush_tlb();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Paranoid: Set warm reset code and vector here back
|
||||||
|
* to default values.
|
||||||
|
*/
|
||||||
|
CMOS_WRITE(0, 0xf);
|
||||||
|
|
||||||
|
*((volatile long *) phys_to_virt(0x467)) = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void smpboot_setup_io_apic(void)
|
static inline void __init smpboot_setup_io_apic(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_X86_IO_APIC
|
||||||
|
/*
|
||||||
|
* Here we can be sure that there is an IO-APIC in the system. Let's
|
||||||
|
* go and set it up:
|
||||||
|
*/
|
||||||
|
if (!skip_ioapic_setup && nr_ioapics)
|
||||||
|
setup_IO_APIC();
|
||||||
|
else {
|
||||||
|
nr_ioapics = 0;
|
||||||
|
localise_nmi_watchdog();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void smpboot_clear_io_apic(void)
|
static inline void smpboot_clear_io_apic(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_X86_IO_APIC
|
||||||
|
nr_ioapics = 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue