diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /arch/mips/mm/c-r3k.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
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 @@ | |||
| 26 | static unsigned long icache_size, dcache_size; /* Size in bytes */ | 26 | static unsigned long icache_size, dcache_size; /* Size in bytes */ |
| 27 | static unsigned long icache_lsize, dcache_lsize; /* Size in bytes */ | 27 | static unsigned long icache_lsize, dcache_lsize; /* Size in bytes */ |
| 28 | 28 | ||
| 29 | unsigned long __init r3k_cache_size(unsigned long ca_flags) | 29 | unsigned long __cpuinit r3k_cache_size(unsigned long ca_flags) |
| 30 | { | 30 | { |
| 31 | unsigned long flags, status, dummy, size; | 31 | unsigned long flags, status, dummy, size; |
| 32 | volatile unsigned long *p; | 32 | volatile unsigned long *p; |
| @@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsigned long ca_flags) | |||
| 61 | return size * sizeof(*p); | 61 | return size * sizeof(*p); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | unsigned long __init r3k_cache_lsize(unsigned long ca_flags) | 64 | unsigned long __cpuinit r3k_cache_lsize(unsigned long ca_flags) |
| 65 | { | 65 | { |
| 66 | unsigned long flags, status, lsize, i; | 66 | unsigned long flags, status, lsize, i; |
| 67 | volatile unsigned long *p; | 67 | volatile unsigned long *p; |
| @@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(unsigned long ca_flags) | |||
| 90 | return lsize * sizeof(*p); | 90 | return lsize * sizeof(*p); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | static void __init r3k_probe_cache(void) | 93 | static void __cpuinit r3k_probe_cache(void) |
| 94 | { | 94 | { |
| 95 | dcache_size = r3k_cache_size(ST0_ISC); | 95 | dcache_size = r3k_cache_size(ST0_ISC); |
| 96 | if (dcache_size) | 96 | if (dcache_size) |