From patchwork Mon Jan 12 22:05:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Travis X-Patchwork-Id: 18016 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 0A812DE2F3 for ; Tue, 13 Jan 2009 09:05:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754524AbZALWFZ (ORCPT ); Mon, 12 Jan 2009 17:05:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754293AbZALWFZ (ORCPT ); Mon, 12 Jan 2009 17:05:25 -0500 Received: from relay1.sgi.com ([192.48.179.29]:54677 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753377AbZALWFW (ORCPT ); Mon, 12 Jan 2009 17:05:22 -0500 Received: from cthulhu.engr.sgi.com (cthulhu.engr.sgi.com [150.166.39.100]) by relay1.corp.sgi.com (Postfix) with ESMTP id 8105E8F8073; Mon, 12 Jan 2009 14:05:21 -0800 (PST) Received: from polaris-admin.engr.sgi.com (polaris-admin.engr.sgi.com [150.166.41.54]) by cthulhu.engr.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id n0CM5KF7012563; Mon, 12 Jan 2009 14:05:21 -0800 Received: by polaris-admin.engr.sgi.com (Postfix, from userid 5508) id C83265646610; Mon, 12 Jan 2009 14:05:20 -0800 (PST) Message-Id: <20090112220520.696603000@polaris-admin.engr.sgi.com> References: <20090112220519.566749000@polaris-admin.engr.sgi.com> User-Agent: quilt/0.46-1 Date: Mon, 12 Jan 2009 14:05:27 -0800 From: Mike Travis To: Ingo Molnar Cc: Rusty Russell , Andrew Morton , Jack Steiner , linux-kernel@vger.kernel.org, "David S. Miller" , Subject: [PATCH 8/8] sparc irq: update sparc for new irq_desc Content-Disposition: inline; filename=irq:update-sparc-to-new-irq_desc Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Impact: cleanup, update to new cpumask API Irq_desc.affinity and irq_desc.pending_mask are now cpumask_var_t's so access to them should be using the new cpumask API. Signed-off-by: Mike Travis Cc: David S. Miller Cc: --- arch/sparc/kernel/irq_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- linux-2.6-for-ingo.orig/arch/sparc/kernel/irq_64.c +++ linux-2.6-for-ingo/arch/sparc/kernel/irq_64.c @@ -247,9 +247,10 @@ struct irq_handler_data { #ifdef CONFIG_SMP static int irq_choose_cpu(unsigned int virt_irq) { - cpumask_t mask = irq_desc[virt_irq].affinity; + cpumask_t mask; int cpuid; + cpumask_copy(&mask, irq_desc[virt_irq].affinity); if (cpus_equal(mask, CPU_MASK_ALL)) { static int irq_rover; static DEFINE_SPINLOCK(irq_rover_lock); @@ -854,7 +855,7 @@ void fixup_irqs(void) !(irq_desc[irq].status & IRQ_PER_CPU)) { if (irq_desc[irq].chip->set_affinity) irq_desc[irq].chip->set_affinity(irq, - &irq_desc[irq].affinity); + irq_desc[irq].affinity); } spin_unlock_irqrestore(&irq_desc[irq].lock, flags); }