From patchwork Tue Feb 8 00:32:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 539411 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 p180WKKc021023 for ; Tue, 8 Feb 2011 00:32:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755412Ab1BHAcU (ORCPT ); Mon, 7 Feb 2011 19:32:20 -0500 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:33695 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755396Ab1BHAcT (ORCPT ); Mon, 7 Feb 2011 19:32:19 -0500 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 70F7F8EE0D9; Mon, 7 Feb 2011 16:32:19 -0800 (PST) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lTajMEdK99PJ; Mon, 7 Feb 2011 16:32:19 -0800 (PST) Received: from [192.168.2.10] (dagonet.hansenpartnership.com [76.243.235.53]) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id C03BE8EE0D7; Mon, 7 Feb 2011 16:32:18 -0800 (PST) Subject: Re: [patch 0/8] parisc: Convert to new irq_chip functions From: James Bottomley To: Thomas Gleixner Cc: linux-parisc@vger.kernel.org, Kyle McMartin In-Reply-To: <1297113986.8577.92.camel@mulgrave.site> References: <20110206204411.109238550@linutronix.de> <1297094535.8577.3.camel@mulgrave.site> <1297100168.8577.42.camel@mulgrave.site> <1297113986.8577.92.camel@mulgrave.site> Date: Mon, 07 Feb 2011 18:32:16 -0600 Message-ID: <1297125136.8577.113.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.30.1.2 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]); Tue, 08 Feb 2011 00:32:23 +0000 (UTC) diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 9eea164..cb450e1 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -113,7 +113,7 @@ int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest) int cpu_dest; /* timer and ipi have to always be received on all CPUs */ - if (CHECK_IRQ_PER_CPU(irq)) { + 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 */ @@ -128,11 +128,11 @@ int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest) } static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest, - bool force)) + bool force) { int cpu_dest; - cpu_dest = cpu_check_affinity(d->irq, dest); + cpu_dest = cpu_check_affinity(d, dest); if (cpu_dest < 0) return -1; @@ -296,7 +296,7 @@ int txn_alloc_irq(unsigned int bits_wide) unsigned long txn_affinity_addr(unsigned int irq, int cpu) { #ifdef CONFIG_SMP - struct irq_data *d = get_irq_data(irq); + struct irq_data *d = irq_get_irq_data(irq); cpumask_copy(d->affinity, cpumask_of(cpu)); #endif diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index a015c12..95930d0 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c @@ -693,7 +693,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d, return -1; cpumask_copy(d->affinity, cpumask_of(dest_cpu)); - vi->txn_addr = txn_affinity_addr(irq, dest_cpu); + vi->txn_addr = txn_affinity_addr(d->irq, dest_cpu); spin_lock_irqsave(&iosapic_lock, flags); /* d1 contains the destination CPU, so only want to set that