Commit b32dfbb9 authored by Shane McDonald's avatar Shane McDonald Committed by Ralf Baechle

[MIPS] Atlas, decstation: Fix section mismatches triggered by defconfigs

Resolve these mismatches by defining affected functions with the __cpuinit
attribute, rather than __init.
Signed-off-by: default avatarShane McDonald <mcdonald.shane@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 86df8642
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
static unsigned long icache_size, dcache_size; /* Size in bytes */ static unsigned long icache_size, dcache_size; /* Size in bytes */
static unsigned long icache_lsize, dcache_lsize; /* Size in bytes */ static unsigned long icache_lsize, dcache_lsize; /* Size in bytes */
unsigned long __init r3k_cache_size(unsigned long ca_flags) unsigned long __cpuinit r3k_cache_size(unsigned long ca_flags)
{ {
unsigned long flags, status, dummy, size; unsigned long flags, status, dummy, size;
volatile unsigned long *p; volatile unsigned long *p;
...@@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsigned long ca_flags) ...@@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsigned long ca_flags)
return size * sizeof(*p); return size * sizeof(*p);
} }
unsigned long __init r3k_cache_lsize(unsigned long ca_flags) unsigned long __cpuinit r3k_cache_lsize(unsigned long ca_flags)
{ {
unsigned long flags, status, lsize, i; unsigned long flags, status, lsize, i;
volatile unsigned long *p; volatile unsigned long *p;
...@@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(unsigned long ca_flags) ...@@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(unsigned long ca_flags)
return lsize * sizeof(*p); return lsize * sizeof(*p);
} }
static void __init r3k_probe_cache(void) static void __cpuinit r3k_probe_cache(void)
{ {
dcache_size = r3k_cache_size(ST0_ISC); dcache_size = r3k_cache_size(ST0_ISC);
if (dcache_size) if (dcache_size)
......
...@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long addr, unsigned long size) ...@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long addr, unsigned long size)
/* /*
* This function is executed in uncached address space. * This function is executed in uncached address space.
*/ */
static __init void __rm7k_sc_enable(void) static __cpuinit void __rm7k_sc_enable(void)
{ {
int i; int i;
...@@ -107,7 +107,7 @@ static __init void __rm7k_sc_enable(void) ...@@ -107,7 +107,7 @@ static __init void __rm7k_sc_enable(void)
} }
} }
static __init void rm7k_sc_enable(void) static __cpuinit void rm7k_sc_enable(void)
{ {
if (read_c0_config() & RM7K_CONF_SE) if (read_c0_config() & RM7K_CONF_SE)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment