Merge branch 'linus' into x86/x2apic

This commit is contained in:
Ingo Molnar
2008-07-18 22:50:34 +02:00
3697 changed files with 244003 additions and 275846 deletions

View File

@@ -245,15 +245,6 @@ static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask)
}
#endif
#ifdef CONFIG_AUTO_IRQ_AFFINITY
extern int select_smp_affinity(unsigned int irq);
#else
static inline int select_smp_affinity(unsigned int irq)
{
return 1;
}
#endif
extern int no_irq_affinity;
static inline int irq_balancing_disabled(unsigned int irq)