Skip to content

Commit

Permalink
x86, VisWS: turn into generic arch, enhance include/asm-x86/mach-defa…
Browse files Browse the repository at this point in the history
…ult/smpboot_hooks.h

Allow the generic smpboot quirks code to be built with
ONFIG_X86_IO_APIC disabled. This way VISWS will be able
to use it as-is.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jul 10, 2008
1 parent d8d1bc7 commit 6a64b5d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions include/asm-x86/mach-default/smpboot_hooks.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

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)
Expand Down Expand Up @@ -35,6 +37,7 @@ static inline void smpboot_restore_warm_reset_vector(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:
Expand All @@ -45,9 +48,12 @@ static inline void __init smpboot_setup_io_apic(void)
nr_ioapics = 0;
localise_nmi_watchdog();
}
#endif
}

static inline void smpboot_clear_io_apic(void)
{
#ifdef CONFIG_X86_IO_APIC
nr_ioapics = 0;
#endif
}

0 comments on commit 6a64b5d

Please sign in to comment.