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; Tue, 21 Apr 2009
 17:57:48 -0700
Received: from psmtp.com ([64.18.0.76]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 21 Apr 2009 17:57:47 -0700
Received: from source ([213.58.128.207]) by exprod5mx217.postini.com
 ([64.18.4.13]) with SMTP;	Tue, 21 Apr 2009 18:57:47 MDT
Received: from localhost.localdomain ([127.0.0.1]:29407 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S28645999AbZDUVdN
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Tue, 21 Apr 2009 22:33:13 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 21 Apr 2009 22:32:56
 +0100 (BST)
Received: from elvis.franken.de ([193.175.24.41]:52455 "EHLO
 elvis.franken.de")	by ftp.linux-mips.org with ESMTP id S29032963AbZDUVbS
 (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue, 21 Apr 2009 22:31:18 +0100
Received: from uucp (helo=solo.franken.de)	by elvis.franken.de with
 local-bsmtp (Exim 3.36 #1)	id 1LwNYj-0001ck-00; Tue, 21 Apr 2009 23:31:17
 +0200
Received: by solo.franken.de (Postfix, from userid 1000)	id 33937C32C0; Tue,
 21 Apr 2009 23:31:12 +0200 (CEST)
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 21 Apr 2009 14:31:12 -0700
Subject: [PATCH] IP27: Fix clash with NMI_OFFSET from hardirq.h
Thread-Topic: [PATCH] IP27: Fix clash with NMI_OFFSET from hardirq.h
Thread-Index: AcnC5VrW+cIS1LTVSy66rpoy+eqG3g==
Message-ID: <20090421213112.33937C32C0@solo.franken.de>
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: 22 Apr 2009 00:57:48.0165 (UTC)
 FILETIME=[5AB17B50:01C9C2E5]
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:86.65994/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-neptune: 0/0/0.00/0
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: jkQGiJY/UZ1Wp9M9eo0Szw==
x-list: linux-mips
x-archive-position: 22403
x-ecartis-version: Ecartis v1.0.0
x-original-sender: tsbogend@alpha.franken.de
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

There was already a define for NMI_OFFSET in asm/sn/addr.h, which now
clashes with linux/hardirq.h. Rename the one in sn/addr.h to fix IP27
builds..

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

 arch/mips/include/asm/sn/addrs.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/sn/addrs.h b/arch/mips/include/asm/sn/ad=
drs.h
index fec9bdd..3a56d90 100644
--- a/arch/mips/include/asm/sn/addrs.h
+++ b/arch/mips/include/asm/sn/addrs.h
@@ -359,11 +359,11 @@
 	TO_NODE_UNCAC((nasid), LAUNCH_OFFSET(nasid, slice))
 #define LAUNCH_SIZE(nasid)	KLD_LAUNCH(nasid)->size
=20
-#define NMI_OFFSET(nasid, slice)					\
+#define SN_NMI_OFFSET(nasid, slice)					\
 	(KLD_NMI(nasid)->offset +					\
 	 KLD_NMI(nasid)->stride * (slice))
 #define NMI_ADDR(nasid, slice)						\
-	TO_NODE_UNCAC((nasid), NMI_OFFSET(nasid, slice))
+	TO_NODE_UNCAC((nasid), SN_NMI_OFFSET(nasid, slice))
 #define NMI_SIZE(nasid)	KLD_NMI(nasid)->size
=20
 #define KLCONFIG_OFFSET(nasid)	KLD_KLCONFIG(nasid)->offset

