[SCSI] Merge up to linux-2.6 head

[linux-2.6-omap-h63xx.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 1940fa75e82e1c88c36fba13f0ed5fd00624892e..eb8bdbae4fc79026f8ee4664f34da66c82076c1e 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line)
  * gcc-3.4 accidentally inlines this function, so use noinline.
  */
 
-static void noinline rest_init(void)
+static void noinline __init_refok rest_init(void)
        __releases(kernel_lock)
 {
        int pid;