init/do_mounts.c: proper prepare_namespace() prototype

Add a proper protype for prepare_namespace() in include/linux/init.h.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/init.h b/include/linux/init.h
index dbbdbd1bec7768137cbcb4564d404561a9846733..8bc32bb2fce20a23e04b9327b1912a59f5e97252 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -77,7 +77,8 @@ extern char *saved_command_line;
 extern unsigned int reset_devices;
 
 /* used by init/main.c */
-extern void setup_arch(char **);
+void setup_arch(char **);
+void prepare_namespace(void);
 
 #endif
   

diff --git a/init/do_mounts.c b/init/do_mounts.c
index dc1ec0803ef9b93b76c27b9db3a9d3e741f98280..3f57ed4599d6d87282f0afaead6e8ae3ad8cbf79 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -9,6 +9,7 @@
 #include <linux/delay.h>
 #include <linux/mount.h>
 #include <linux/device.h>
+#include <linux/init.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>

diff --git a/init/main.c b/init/main.c
index 0e22f40487bba5bceea3ddf7266b0a340e005ce1..949c27b59d126b448cb113946d1a635328db8664 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -94,7 +94,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void prepare_namespace(void);
 #ifdef CONFIG_ACPI
 extern void acpi_early_init(void);
 #else