From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758240AbZALWHn (ORCPT ); Mon, 12 Jan 2009 17:07:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754266AbZALWFZ (ORCPT ); Mon, 12 Jan 2009 17:05:25 -0500 Received: from relay3.sgi.com ([192.48.171.31]:46119 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751361AbZALWFW (ORCPT ); Mon, 12 Jan 2009 17:05:22 -0500 Message-Id: <20090112220520.303833000@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:24 -0800 From: Mike Travis To: Ingo Molnar Cc: Rusty Russell , Andrew Morton , Jack Steiner , linux-kernel@vger.kernel.org, Ralf Baechle , Subject: [PATCH 5/8] mips irq: update mips for new irq_desc Content-Disposition: inline; filename=irq:update-mips-to-new-irq_desc Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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: Ralf Baechle Cc: --- arch/mips/include/asm/irq.h | 2 +- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/kernel/smtc.c | 2 +- arch/mips/mti-malta/malta-smtc.c | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) --- linux-2.6-for-ingo.orig/arch/mips/include/asm/irq.h +++ linux-2.6-for-ingo/arch/mips/include/asm/irq.h @@ -66,7 +66,7 @@ extern void smtc_forward_irq(unsigned in */ #define IRQ_AFFINITY_HOOK(irq) \ do { \ - if (!cpu_isset(smp_processor_id(), irq_desc[irq].affinity)) { \ + if (!cpumask_test_cpu(smp_processor_id(), irq_desc[irq].affinity)) {\ smtc_forward_irq(irq); \ irq_exit(); \ return; \ --- linux-2.6-for-ingo.orig/arch/mips/kernel/irq-gic.c +++ linux-2.6-for-ingo/arch/mips/kernel/irq-gic.c @@ -187,7 +187,7 @@ static void gic_set_affinity(unsigned in set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); } - irq_desc[irq].affinity = *cpumask; + cpumask_copy(irq_desc[irq].affinity, cpumask); spin_unlock_irqrestore(&gic_lock, flags); } --- linux-2.6-for-ingo.orig/arch/mips/kernel/smtc.c +++ linux-2.6-for-ingo/arch/mips/kernel/smtc.c @@ -686,7 +686,7 @@ void smtc_forward_irq(unsigned int irq) * and efficiency, we just pick the easiest one to find. */ - target = first_cpu(irq_desc[irq].affinity); + target = cpumask_first(irq_desc[irq].affinity); /* * We depend on the platform code to have correctly processed --- linux-2.6-for-ingo.orig/arch/mips/mti-malta/malta-smtc.c +++ linux-2.6-for-ingo/arch/mips/mti-malta/malta-smtc.c @@ -116,7 +116,7 @@ struct plat_smp_ops msmtc_smp_ops = { void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinity) { - cpumask_t tmask = *affinity; + cpumask_t tmask; int cpu = 0; void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff); @@ -139,11 +139,12 @@ void plat_set_irq_affinity(unsigned int * be made to forward to an offline "CPU". */ + cpumask_copy(&tmask, affinity); for_each_cpu(cpu, affinity) { if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu)) cpu_clear(cpu, tmask); } - irq_desc[irq].affinity = tmask; + cpumask_copy(irq_desc[irq].affinity, &tmask); if (cpus_empty(tmask)) /* --