summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-26 10:29:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-26 10:29:18 -0700
commitfc2e3180a714d3125fc883541c0cd5936c99ba34 (patch)
treec4e590a6ee64b1afb4ece1f7dee41a405849df2e /kernel
parent1e4b978154c8cb6cdadd1988c597ef20f837679e (diff)
parentca713c2ab0eea3458962983e4a7e13430ea479b8 (diff)
downloadlinux-fc2e3180a714d3125fc883541c0cd5936c99ba34.tar.gz
linux-fc2e3180a714d3125fc883541c0cd5936c99ba34.tar.bz2
linux-fc2e3180a714d3125fc883541c0cd5936c99ba34.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: x86/irq: mark NUMA_MIGRATE_IRQ_DESC broken x86, irq: Remove IRQ_DISABLED check in process context IRQ move
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/manage.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7e2e7dd4cd2f..2734eca59243 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -109,10 +109,9 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
spin_lock_irqsave(&desc->lock, flags);
#ifdef CONFIG_GENERIC_PENDING_IRQ
- if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) {
- cpumask_copy(desc->affinity, cpumask);
+ if (desc->status & IRQ_MOVE_PCNTXT)
desc->chip->set_affinity(irq, cpumask);
- } else {
+ else {
desc->status |= IRQ_MOVE_PENDING;
cpumask_copy(desc->pending_mask, cpumask);
}