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; Thu, 4 Feb 2010
 16:50:30 -0700
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id o14NoSbr009998	for
 <andy.sharp@lsi.com>; Thu, 4 Feb 2010 15:50:29 -0800
Received: from psmtp.com (na3sys009amx196.postini.com [74.125.149.177])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id o14NoNLM008314	for
 <andy.sharp@lsi.com>; Thu, 4 Feb 2010 15:50:26 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx196.postini.com
 ([74.125.148.14]) with SMTP;	Thu, 04 Feb 2010 18:50:26 EST
Received: from localhost.localdomain ([127.0.0.1]:51984 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1493135Ab0BDXuI (ORCPT
        <rfc822;andy.sharp@lsi.com>); Fri, 5 Feb 2010 00:50:08 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 05 Feb 2010 00:49:50
 +0100 (CET)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:5227 "EHLO
        mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)        by
 eddie.linux-mips.org with ESMTP id S1493178Ab0BDXtq (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Fri, 5 Feb 2010 00:49:46 +0100
Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by
 mail3.caviumnetworks.com with MailMarshal (v6,7,2,8378)        id
 <B4b6b5d200000>; Thu, 04 Feb 2010 15:49:52 -0800
Received: from caexch01.caveonetworks.com ([192.168.16.9]) by
 caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);
         Thu, 4 Feb 2010 15:48:55 -0800
Received: from dd1.caveonetworks.com ([12.108.191.236]) by
 caexch01.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);         Thu, 4 Feb 2010 15:48:55 -0800
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])
        by dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id o14Nmpfb002974;
        Thu, 4 Feb 2010 15:48:51 -0800
Received: (from ddaney@localhost)        by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id o14Nmnmi002973;        Thu, 4 Feb 2010 15:48:49
 -0800
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 4 Feb 2010 16:48:49 -0700
Subject: [PATCH] MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
Thread-Topic: [PATCH] MIPS: Fix __devinit __cpuinit confusion in
 cpu_cache_init
Thread-Index: Acql9NVuBg3U+b9fToykhHmnHFL9bw==
Message-ID: <1265327329-2949-1-git-send-email-ddaney@caviumnetworks.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-originalarrivaltime: 04 Feb 2010 23:48:55.0643 (UTC)
 FILETIME=[9CE66AB0:01CAA5F4]
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 <ddaney@caviumnetworks.com> [22/1] 
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

cpu_cache_init and the things it calls should all be __cpuinit instead
of __devinit.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/mm/c-octeon.c |    4 ++--
 arch/mips/mm/cache.c    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c
index e75174a..af85959 100644
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
@@ -174,7 +174,7 @@ static void octeon_flush_cache_page(struct vm_area_stru=
ct *vma,
  * Probe Octeon's caches
  *
  */
-static void __devinit probe_octeon(void)
+static void __cpuinit probe_octeon(void)
 {
 	unsigned long icache_size;
 	unsigned long dcache_size;
@@ -235,7 +235,7 @@ static void __devinit probe_octeon(void)
  * Setup the Octeon cache flush routines
  *
  */
-void __devinit octeon_cache_init(void)
+void __cpuinit octeon_cache_init(void)
 {
 	extern unsigned long ebase;
 	extern char except_vec2_octeon;
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 102b2df..e716caf 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -155,7 +155,7 @@ static inline void setup_protection_map(void)
 	protection_map[15] =3D PAGE_SHARED;
 }
=20
-void __devinit cpu_cache_init(void)
+void __cpuinit cpu_cache_init(void)
 {
 	if (cpu_has_3k_cache) {
 		extern void __weak r3k_cache_init(void);
--=20
1.6.0.6


