diff options
| author | Ingo Molnar | 2008-10-10 19:50:00 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-11 20:17:36 +0200 |
| commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /kernel/irq/manage.c | |
| parent | Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for... (diff) | |
| parent | x86: fix apic version warning (diff) | |
| download | kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.tar.gz kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.tar.xz kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.zip | |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 0314074fa232..60c49e324390 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -89,7 +89,14 @@ int irq_set_affinity(unsigned int irq, cpumask_t cpumask) set_balance_irq_affinity(irq, cpumask); #ifdef CONFIG_GENERIC_PENDING_IRQ - set_pending_irq(irq, cpumask); + if (desc->status & IRQ_MOVE_PCNTXT) { + unsigned long flags; + + spin_lock_irqsave(&desc->lock, flags); + desc->chip->set_affinity(irq, cpumask); + spin_unlock_irqrestore(&desc->lock, flags); + } else + set_pending_irq(irq, cpumask); #else desc->affinity = cpumask; desc->chip->set_affinity(irq, cpumask); |