From: Shane McDonald <redacted>

There is a section mismatch in the arch/mips/mm/sc-rm7k.c file.
The function rm7k_sc_init, defined with attribute __cpuinit,
calls rm7k_sc_enable, which is defined with attribute __init.
This patch defines them both as __cpuinit, as well as the function
__rm7k_sc_enable which is called by rm7k_sc_enable.

Signed-off-by: Shane McDonald <redacted>
---
 arch/mips/mm/sc-rm7k.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -uprN -X orig/Documentation/dontdiff orig/arch/mips/mm/sc-rm7k.c patched/arch/mips/mm/sc-rm7k.c

--- orig/arch/mips/mm/sc-rm7k.c	2008-06-21 05:37:08.000000000 -0600
+++ patched/arch/mips/mm/sc-rm7k.c	2008-06-21 05:40:06.000000000 -0600

@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long ad
 /*
  * This function is executed in uncached address space.
  */
-static __init void __rm7k_sc_enable(void)
+static __cpuinit void __rm7k_sc_enable(void)
 {
 	int i;
 

@@ -107,7 +107,7 @@ static __init void __rm7k_sc_enable(void
 	}
 }
 
-static __init void rm7k_sc_enable(void)
+static __cpuinit void rm7k_sc_enable(void)
 {
 	if (read_c0_config() & RM7K_CONF_SE)
 		return;