diff options
| author | Shane McDonald <mcdonald.shane@gmail.com> | 2008-07-05 17:19:42 -0600 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-08 19:33:46 +0100 |
| commit | b32dfbb9c54393af32761add16e249664193621f (patch) | |
| tree | 546dcd5322f9406e6663c55724b8139205c4cbcc /arch/mips/mm/c-r3k.c | |
| parent | 86df86424939d316b1f6cfac1b6204f0c7dee317 (diff) | |
| download | kernel_samsung_aries-b32dfbb9c54393af32761add16e249664193621f.zip kernel_samsung_aries-b32dfbb9c54393af32761add16e249664193621f.tar.gz kernel_samsung_aries-b32dfbb9c54393af32761add16e249664193621f.tar.bz2 | |
[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: Shane McDonald <mcdonald.shane@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/c-r3k.c')
| -rw-r--r-- | arch/mips/mm/c-r3k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c index 76935e3..27a5b46 100644 --- a/arch/mips/mm/c-r3k.c +++ b/arch/mips/mm/c-r3k.c @@ -26,7 +26,7 @@ static unsigned long icache_size, dcache_size; /* 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; volatile unsigned long *p; @@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsigned long ca_flags) 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; volatile unsigned long *p; @@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(unsigned long ca_flags) 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); if (dcache_size) |