diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
| commit | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (patch) | |
| tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /arch/mips/mm/c-r3k.c | |
| parent | a6784ad7eafa74a085c8458909eda0699a8fcf57 (diff) | |
| parent | 8dd779b19ce5972072ad2372a86c8acbae4da768 (diff) | |
Merge branch 'x86/unify-pci' into x86/core
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 76935e320214..27a5b466c85c 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) |