aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-22 23:44:33 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-22 23:44:33 (GMT)
commitb600ffaebcc4791add19e04306f0478a963abe71 (patch)
tree9ad8a8ec2c6339f0d110de56e5aab742d466ec75
parent81cbf6d0555d77b2a4235c03f24167e2d792ccf5 (diff)
parent61f3826133dc07142935fb5712fc738e19eb5575 (diff)
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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index f0de36f..61c679d 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

Privacy Policy