diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2010-02-04 15:48:49 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-10 22:15:45 +0100 |
| commit | 63731c964d6cd9de4800891bd33b6f9e47a249bc (patch) | |
| tree | 32869cf37195162789b1a8d8d6041905539af9a2 | |
| parent | 59d302b342e5d451c4448479e82e1105864a3112 (diff) | |
| download | linux-3.10-63731c964d6cd9de4800891bd33b6f9e47a249bc.tar.gz linux-3.10-63731c964d6cd9de4800891bd33b6f9e47a249bc.tar.bz2 linux-3.10-63731c964d6cd9de4800891bd33b6f9e47a249bc.zip | |
MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
cpu_cache_init and the things it calls should all be __cpuinit instead
of __devinit.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/938/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/mm/c-octeon.c | 4 | ||||
| -rw-r--r-- | 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 94e05e5733c..e06f1af760a 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_struct *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 102b2dfa542..e716cafc346 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] = PAGE_SHARED; } -void __devinit cpu_cache_init(void) +void __cpuinit cpu_cache_init(void) { if (cpu_has_3k_cache) { extern void __weak r3k_cache_init(void); |