Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[mirror_ubuntu-kernels.git] / arch / mips / lib / uncached.c

diff --git a/arch/mips/lib/uncached.c b/arch/mips/lib/uncached.c
index 27b012d4341c2ad6f259ac33b4557b7360bc0a9b..a6d1c77034d5ea351bd140c7ee78fd86cdf515dd 100644 (file)
--- a/arch/mips/lib/uncached.c
+++ b/arch/mips/lib/uncached.c
@@ -36,7 +36,7 @@
  * values, so we can avoid sharing the same stack area between a cached
  * and the uncached mode.
  */
-unsigned long __init run_uncached(void *func)
+unsigned long __cpuinit run_uncached(void *func)
 {
        register long sp __asm__("$sp");
        register long ret __asm__("$2");