diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 01:01:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-12 01:01:46 +0300 |
| commit | 9883b83d6fb2f87e0eb6c8839325272466041577 (patch) | |
| tree | a61cede09f8c47016af954311a8ed248bf4d2f34 /arch/mips/mm/cache.c | |
| parent | a4b4df279471ec360de11ec86640fd8a3c533487 (diff) | |
| parent | 5b7efa898b357e6ebe4024c520e62024eb969b5f (diff) | |
| download | linux-9883b83d6fb2f87e0eb6c8839325272466041577.tar.xz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Don't probe reserved EntryHi bits.
MIPS: SNI: Correct NULL test
MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
MIPS: IP27: Make defconfig useful again.
MIPS: Fixup of the r4k timer
Diffstat (limited to 'arch/mips/mm/cache.c')
| -rw-r--r-- | arch/mips/mm/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 102b2dfa542a..e716cafc346d 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); |