From patchwork Fri Mar 25 13:40:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 662231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2PDefoC019060 for ; Fri, 25 Mar 2011 13:40:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753238Ab1CYNkU (ORCPT ); Fri, 25 Mar 2011 09:40:20 -0400 Received: from www.linutronix.de ([62.245.132.108]:38507 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752673Ab1CYNkT (ORCPT ); Fri, 25 Mar 2011 09:40:19 -0400 Received: from localhost ([127.0.0.1] helo=localhost6.localdomain6) by Galois.linutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Q37FP-0004FO-NP; Fri, 25 Mar 2011 14:40:16 +0100 Message-Id: <20110325133952.877111800@linutronix.de> User-Agent: quilt/0.48-1 Date: Fri, 25 Mar 2011 13:40:15 -0000 From: Thomas Gleixner To: "James E.J. Bottomley" Cc: Kyle McMartin , linux-parisc@vger.kernel.org Subject: [patch 1/2] parisc: Convert the final irq bits References: <20110325133845.830304772@linutronix.de> Content-Disposition: inline; filename=parisc-cleanup.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Mar 2011 13:40:41 +0000 (UTC) Index: linux-2.6-tip/arch/parisc/kernel/irq.c =================================================================== --- linux-2.6-tip.orig/arch/parisc/kernel/irq.c +++ linux-2.6-tip/arch/parisc/kernel/irq.c @@ -113,13 +113,8 @@ int cpu_check_affinity(struct irq_data * int cpu_dest; /* timer and ipi have to always be received on all CPUs */ - if (CHECK_IRQ_PER_CPU(irq_to_desc(d->irq)->status)) { - /* Bad linux design decision. The mask has already - * been set; we must reset it. Will fix - tglx - */ - cpumask_setall(d->affinity); + if (irqd_is_per_cpu(d)) return -EINVAL; - } /* whatever mask they set, we just allow one CPU */ cpu_dest = first_cpu(*dest); @@ -357,7 +352,7 @@ void do_cpu_irq_mask(struct pt_regs *reg #ifdef CONFIG_SMP desc = irq_to_desc(irq); cpumask_copy(&dest, desc->irq_data.affinity); - if (CHECK_IRQ_PER_CPU(desc->status) && + if (irqd_is_per_cpu(&desc->irq_data) && !cpu_isset(smp_processor_id(), dest)) { int cpu = first_cpu(dest);