diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
| commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
| tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /include/linux/irq.h | |
| parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index c211984b55e5..8d9411bc60f6 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -245,15 +245,6 @@ static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask) | |||
| 245 | } | 245 | } |
| 246 | #endif | 246 | #endif |
| 247 | 247 | ||
| 248 | #ifdef CONFIG_AUTO_IRQ_AFFINITY | ||
| 249 | extern int select_smp_affinity(unsigned int irq); | ||
| 250 | #else | ||
| 251 | static inline int select_smp_affinity(unsigned int irq) | ||
| 252 | { | ||
| 253 | return 1; | ||
| 254 | } | ||
| 255 | #endif | ||
| 256 | |||
| 257 | extern int no_irq_affinity; | 248 | extern int no_irq_affinity; |
| 258 | 249 | ||
| 259 | static inline int irq_balancing_disabled(unsigned int irq) | 250 | static inline int irq_balancing_disabled(unsigned int irq) |