diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-11-07 13:18:30 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-09 22:23:49 +0100 |
commit | f6d87f4bd259cf33e092cd1a8fde05f291c47af1 (patch) | |
tree | abaa66af3c80fb18a20004b8d97261c680551792 /kernel/irq/proc.c | |
parent | 8b805ef617cf0e02f6d18b891f8deb6246421b01 (diff) | |
download | linux-f6d87f4bd259cf33e092cd1a8fde05f291c47af1.tar.gz linux-f6d87f4bd259cf33e092cd1a8fde05f291c47af1.tar.bz2 linux-f6d87f4bd259cf33e092cd1a8fde05f291c47af1.zip |
genirq: keep affinities set from userspace across free/request_irq()
Impact: preserve user-modified affinities on interrupts
Kumar Galak noticed that commit
18404756765c713a0be4eb1082920c04822ce588 (genirq: Expose default irq
affinity mask (take 3))
overrides an already set affinity setting across a free /
request_irq(). Happens e.g. with ifdown/ifup of a network device.
Change the logic to mark the affinities as set and keep them
intact. This also fixes the unlocked access to irq_desc in
irq_select_affinity() when called from irq_affinity_proc_write()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/proc.c')
-rw-r--r-- | kernel/irq/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 4d161c70ba55..d257e7d6a8a4 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -62,7 +62,7 @@ static ssize_t irq_affinity_proc_write(struct file *file, if (!cpus_intersects(new_value, cpu_online_map)) /* Special case for empty set - allow the architecture code to set default SMP affinity. */ - return irq_select_affinity(irq) ? -EINVAL : count; + return irq_select_affinity_usr(irq) ? -EINVAL : count; irq_set_affinity(irq, new_value); |