Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Mon, 12 Jan 2009
 14:06:15 -0800
Received: from chiesmta2-1.messageone.com ([216.203.30.55]) by mail.onstor.com
 with Microsoft SMTPSVC(6.0.3790.3959);	 Mon, 12 Jan 2009 14:06:14 -0800
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])	by
 chiesmta2-1.messageone.com (8.13.8/8.13.8) with ESMTP id n0CM6HUS011456	for
 <andy.sharp@onstor.com>; Mon, 12 Jan 2009 16:06:17 -0600
Received: from localhost.localdomain ([127.0.0.1]:490 "EHLO
 ftp.linux-mips.org")	by ftp.linux-mips.org with ESMTP id S21103414AbZALWFt
 (ORCPT	<rfc822;andy.sharp@onstor.com>); Mon, 12 Jan 2009 22:05:49 +0000
Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 12 Jan 2009 22:05:32
 +0000 (GMT)
Received: from relay3.sgi.com ([192.48.171.31]:36230 "EHLO relay.sgi.com")	by
 ftp.linux-mips.org with ESMTP id S21103411AbZALWFa (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Mon, 12 Jan 2009 22:05:30 +0000
Received: from cthulhu.engr.sgi.com (cthulhu.engr.sgi.com [150.166.39.100])	by
 relay3.corp.sgi.com (Postfix) with ESMTP id 5D242AC00A;	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 n0CM5KF7012556;	Mon, 12 Jan 2009 14:05:20 -0800
Received: by polaris-admin.engr.sgi.com (Postfix, from userid 5508)	id
 671C25646613; Mon, 12 Jan 2009 14:05:20 -0800 (PST)
From: Mike Travis <travis@sgi.com>
To: Ingo Molnar <mingo@redhat.com>
CC: Rusty Russell <rusty@rustcorp.com.au>, Andrew Morton
	<akpm@linux-foundation.org>, Jack Steiner <steiner@sgi.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Ralf Baechle
	<ralf@linux-mips.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 12 Jan 2009 14:05:24 -0800
Subject: [PATCH 5/8] mips irq: update mips for new irq_desc
Thread-Topic: [PATCH 5/8] mips irq: update mips for new irq_desc
Thread-Index: Acl1Af0pZ+8ezR6mQdWmKfce38WCpg==
Message-ID: <20090112220520.303833000@polaris-admin.engr.sgi.com>
References: <20090112220519.566749000@polaris-admin.engr.sgi.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 12 Jan 2009 22:06:15.0197 (UTC)
 FILETIME=[FCB5F4D0:01C97501]
user-agent: quilt/0.46-1
errors-to: linux-mips-bounce@linux-mips.org
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: wM8kCST6lYlWTQe/OaiP1g==
x-messageone-virus-version: vendor=fsecure
 engine=4.65.7400:2.4.4,1.2.40,4.0.164
 definitions=2009-01-12_10:2009-01-08,2009-01-12,2009-01-12 signatures=0
x-messageone-virus-scanned: Clean
x-messageone-envelope-sender: linux-mips-bounce@linux-mips.org
x-messageone-spam-details: rule=m773emszm_notspam policy=m773emszm score=0
 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam
 adjust=0 reason=mlx engine=3.1.0-0810130000 definitions=main-0901120175
x-messageone-spam-score: 0
x-messageone-spam-bar:
x-list: linux-mips
x-archive-position: 21715
x-ecartis-version: Ecartis v1.0.0
x-original-sender: travis@sgi.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

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 <travis@sgi.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: <linux-mips@linux-mips.org>
---
 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);
=20
 	}
-	irq_desc[irq].affinity =3D *cpumask;
+	cpumask_copy(irq_desc[irq].affinity, cpumask);
 	spin_unlock_irqrestore(&gic_lock, flags);
=20
 }
--- 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.
 	 */
=20
-	target =3D first_cpu(irq_desc[irq].affinity);
+	target =3D cpumask_first(irq_desc[irq].affinity);
=20
 	/*
 	 * 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 =3D {
=20
 void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinit=
y)
 {
-	cpumask_t tmask =3D *affinity;
+	cpumask_t tmask;
 	int cpu =3D 0;
 	void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff);
=20
@@ -139,11 +139,12 @@ void plat_set_irq_affinity(unsigned int=20
 	 * be made to forward to an offline "CPU".
 	 */
=20
+	cpumask_copy(&tmask, affinity);
 	for_each_cpu(cpu, affinity) {
 		if ((cpu_data[cpu].vpe_id !=3D 0) || !cpu_online(cpu))
 			cpu_clear(cpu, tmask);
 	}
-	irq_desc[irq].affinity =3D tmask;
+	cpumask_copy(irq_desc[irq].affinity, &tmask);
=20
 	if (cpus_empty(tmask))
 		/*

--=20

