From 9a9b44bf5ae108e66256f6fbdb1b1b1a9f6e82e0 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 7 Feb 2011 17:30:50 +0100 Subject: [PATCH] --- yaml --- r: 234696 b: refs/heads/master c: b008207cbd0d5ce606a1a2ac52826e0ab37d0b99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/irq/manage.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3f967052f8db..b99e3f7d6dd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fa46f1f070961783661ae640cd2f6b2557f3885 +refs/heads/master: b008207cbd0d5ce606a1a2ac52826e0ab37d0b99 diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 99f3e9a3780c..591c927b135c 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -256,6 +256,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); */ static int setup_affinity(unsigned int irq, struct irq_desc *desc) { + /* Excludes PER_CPU and NO_BALANCE interrupts */ if (!irq_can_set_affinity(irq)) return 0; @@ -263,7 +264,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc) * Preserve an userspace affinity setup, but make sure that * one of the targets is online. */ - if (desc->status & (IRQ_AFFINITY_SET | IRQ_NO_BALANCING)) { + if (desc->status & (IRQ_AFFINITY_SET)) { if (cpumask_any_and(desc->irq_data.affinity, cpu_online_mask) < nr_cpu_ids) goto set_affinity;