summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/numaq
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 07:17:26 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-28 23:20:22 +0100
commit33a201fac698a93d9d1ffa77030ba2ff38d1a3d1 (patch)
treec1087d996f5d83f987e83380f27aa73c7aaa0871 /arch/x86/include/asm/numaq
parent72ce016583916fb7ffcbaa6a3e1f8f731b79a865 (diff)
x86, apic: streamline the ->multi_timer_check() quirk
only NUMAQ uses this quirk: to prevent the timer IRQ from being added on secondary nodes. All other genapic templates can have a NULL ->multi_timer_check() callback. Also, extend the generic code to treat a NULL pointer accordingly. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/numaq')
-rw-r--r--arch/x86/include/asm/numaq/apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index 2feb7e72e9e..22bdf3d4c0e 100644
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -43,7 +43,7 @@ static inline void numaq_setup_apic_routing(void)
* Skip adding the timer int on secondary nodes, which causes
* a small but painful rift in the time-space continuum.
*/
-static inline int multi_timer_check(int apic, int irq)
+static inline int numaq_multi_timer_check(int apic, int irq)
{
return apic != 0 && irq == 0;
}