diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 11:30:50 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:07 -0500 |
commit | b008207cbd0d5ce606a1a2ac52826e0ab37d0b99 (patch) | |
tree | ef3d7bc8414aa232829483e64f37758f3fdeebc2 /kernel/irq/manage.c | |
parent | 1fa46f1f070961783661ae640cd2f6b2557f3885 (diff) |
genirq: Rremove redundant check
IRQ_NO_BALANCING is already checked in irq_can_set_affinity() above,
no need to check it again.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 99f3e9a3780c..591c927b135c 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -256,6 +256,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); | |||
256 | */ | 256 | */ |
257 | static int setup_affinity(unsigned int irq, struct irq_desc *desc) | 257 | static int setup_affinity(unsigned int irq, struct irq_desc *desc) |
258 | { | 258 | { |
259 | /* Excludes PER_CPU and NO_BALANCE interrupts */ | ||
259 | if (!irq_can_set_affinity(irq)) | 260 | if (!irq_can_set_affinity(irq)) |
260 | return 0; | 261 | return 0; |
261 | 262 | ||
@@ -263,7 +264,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc) | |||
263 | * Preserve an userspace affinity setup, but make sure that | 264 | * Preserve an userspace affinity setup, but make sure that |
264 | * one of the targets is online. | 265 | * one of the targets is online. |
265 | */ | 266 | */ |
266 | if (desc->status & (IRQ_AFFINITY_SET | IRQ_NO_BALANCING)) { | 267 | if (desc->status & (IRQ_AFFINITY_SET)) { |
267 | if (cpumask_any_and(desc->irq_data.affinity, cpu_online_mask) | 268 | if (cpumask_any_and(desc->irq_data.affinity, cpu_online_mask) |
268 | < nr_cpu_ids) | 269 | < nr_cpu_ids) |
269 | goto set_affinity; | 270 | goto set_affinity; |