diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
| commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
| tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /kernel/irq | |
| parent | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (diff) | |
| parent | 6574612fbb34c63117581e68f2231ddce027e41e (diff) | |
| download | kernel_samsung_aries-8560b9321f9050968f393ce1ec67e47c1a0bd5cf.zip kernel_samsung_aries-8560b9321f9050968f393ce1ec67e47c1a0bd5cf.tar.gz kernel_samsung_aries-8560b9321f9050968f393ce1ec67e47c1a0bd5cf.tar.bz2 | |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/manage.c | 5 | ||||
| -rw-r--r-- | kernel/irq/numa_migrate.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 7e2e7dd..2734eca 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); } diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c index 243d612..44bbdcb 100644 --- a/kernel/irq/numa_migrate.c +++ b/kernel/irq/numa_migrate.c @@ -54,6 +54,7 @@ static bool init_copy_one_irq_desc(int irq, struct irq_desc *old_desc, static void free_one_irq_desc(struct irq_desc *old_desc, struct irq_desc *desc) { free_kstat_irqs(old_desc, desc); + free_desc_masks(old_desc, desc); arch_free_chip_data(old_desc, desc); } |