Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 8 Mar 2010
 23:25:43 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o296PcMd023674	for
 <andy.sharp@lsi.com>; Mon, 8 Mar 2010 22:25:39 -0800
Received: from psmtp.com (na3sys009amx228.postini.com [74.125.149.112])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id o296KBFj011136	for
 <andy.sharp@lsi.com>; Mon, 8 Mar 2010 22:20:30 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx228.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 09 Mar 2010 00:25:36 CST
Received: from localhost.localdomain ([127.0.0.1]:57949 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1491853Ab0CIGY7 (ORCPT
        <rfc822;andy.sharp@lsi.com>); Tue, 9 Mar 2010 07:24:59 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 09 Mar 2010 07:24:41
 +0100 (CET)
Received: from mail.windriver.com ([147.11.1.11]:32864 "EHLO
        mail.windriver.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org
        with ESMTP id S1491206Ab0CIGYg (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Tue, 9 Mar 2010 07:24:36 +0100
Received: from localhost.localdomain (pek-lpgbuild1.wrs.com [128.224.153.29])
        by mail.windriver.com (8.14.3/8.14.3) with ESMTP id o296ONxo028846;
        Mon, 8 Mar 2010 22:24:24 -0800 (PST)
From: Yang Shi <yang.shi@windriver.com>
To: "ddaney@caviumnetworks.com" <ddaney@caviumnetworks.com>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: "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, 8 Mar 2010 23:24:22 -0700
Subject: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
Thread-Topic: [PATCH] MIPS: Octeon: Fix wrong variable type in smp.c
Thread-Index: Acq/UVk/mwF4zdNkTwCGF/ko05f+Lg==
Message-ID: <1268115862-25976-1-git-send-email-yang.shi@windriver.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/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-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <yang.shi@windriver.com> [22/1] 
x-pstn-neptune: 0/0/0.00/0
x-list: linux-mips
x-original-sender: yang.shi@windriver.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Change cvmx_ciu_wdogx_t type to "union cvmx_ciu_wdogx".

Signed-off-by: Yang Shi <yang.shi@windriver.com>
---
 arch/mips/cavium-octeon/smp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 51e9802..52d61ba 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -281,7 +281,7 @@ static void octeon_cpu_die(unsigned int cpu)
=20
 #ifdef CONFIG_CAVIUM_OCTEON_WATCHDOG
 	/* Disable the watchdog */
-	cvmx_ciu_wdogx_t ciu_wdog;
+	union cvmx_ciu_wdogx ciu_wdog;
 	ciu_wdog.u64 =3D cvmx_read_csr(CVMX_CIU_WDOGX(cpu));
 	ciu_wdog.s.mode =3D 0;
 	cvmx_write_csr(CVMX_CIU_WDOGX(cpu), ciu_wdog.u64);
--=20
1.6.3.3


