diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 16:44:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 16:44:33 -0700 |
| commit | b600ffaebcc4791add19e04306f0478a963abe71 (patch) | |
| tree | 9ad8a8ec2c6339f0d110de56e5aab742d466ec75 | |
| parent | 81cbf6d0555d77b2a4235c03f24167e2d792ccf5 (diff) | |
| parent | 61f3826133dc07142935fb5712fc738e19eb5575 (diff) | |
| download | blackbird-op-linux-b600ffaebcc4791add19e04306f0478a963abe71.tar.gz blackbird-op-linux-b600ffaebcc4791add19e04306f0478a963abe71.zip | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Fix UP compile failure caused by irq_thread_check_affinity
| -rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index f0de36f13a44..61c679db4687 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action) return -1; } +#ifdef CONFIG_SMP /* * Check whether we need to change the affinity of the interrupt thread. */ @@ -478,6 +479,10 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) set_cpus_allowed_ptr(current, mask); free_cpumask_var(mask); } +#else +static inline void +irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) { } +#endif /* * Interrupt handler thread |
