From 4ef73d7822b6c5690d5c32394915681bd7eb1602 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 8 Feb 2011 16:53:24 +0100 Subject: [PATCH] --- yaml --- r: 234741 b: refs/heads/master c: fae581e588e64a0690f3fc995e404fcacaebe772 h: refs/heads/master i: 234739: 0a71c16a72fcb2e78bc6baf5a5050cdf1368fdcf v: v3 --- [refs] | 2 +- trunk/kernel/irq/manage.c | 4 ++-- trunk/kernel/irq/migration.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5bc2c4d8e301..3ef5d0a8c929 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f53f92404bead2ab2154d45c8f508880bb5d95d +refs/heads/master: fae581e588e64a0690f3fc995e404fcacaebe772 diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 056aa49698b4..f1cfa271ba70 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq) { struct irq_desc *desc = irq_to_desc(irq); - if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip || - !desc->irq_data.chip->irq_set_affinity) + if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) || + !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity) return 0; return 1; diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c index 9485ae081dcd..24f53caddf47 100644 --- a/trunk/kernel/irq/migration.c +++ b/trunk/kernel/irq/migration.c @@ -15,7 +15,7 @@ void move_masked_irq(int irq) /* * Paranoia: cpu-local interrupts shouldn't be calling in here anyway. */ - if (CHECK_IRQ_PER_CPU(desc->status)) { + if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) { WARN_ON(1); return; }