aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-05-08 03:24:47 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:00 -0400
commit46595390e97b3ab2741a36f5ff69e8f6033fa9c0 (patch)
tree911fb1bd59ecf260999eca19fad4534f719894da
parentb2ead6e012e2b2ab31851c288e0dd7872884a8a3 (diff)
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>
-rw-r--r--include/linux/init.h3
-rw-r--r--init/do_mounts.c1
-rw-r--r--init/main.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h
index dbbdbd1bec77..8bc32bb2fce2 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -77,7 +77,8 @@ extern char *saved_command_line;
77extern unsigned int reset_devices; 77extern unsigned int reset_devices;
78 78
79/* used by init/main.c */ 79/* used by init/main.c */
80extern void setup_arch(char **); 80void setup_arch(char **);
81void prepare_namespace(void);
81 82
82#endif 83#endif
83 84
diff --git a/init/do_mounts.c b/init/do_mounts.c
index dc1ec0803ef9..3f57ed4599d6 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -9,6 +9,7 @@
9#include <linux/delay.h> 9#include <linux/delay.h>
10#include <linux/mount.h> 10#include <linux/mount.h>
11#include <linux/device.h> 11#include <linux/device.h>
12#include <linux/init.h>
12 13
13#include <linux/nfs_fs.h> 14#include <linux/nfs_fs.h>
14#include <linux/nfs_fs_sb.h> 15#include <linux/nfs_fs_sb.h>
diff --git a/init/main.c b/init/main.c
index 0e22f40487bb..949c27b59d12 100644
--- a/init/main.c
+++ b/init/main.c
@@ -94,7 +94,6 @@ extern void pidmap_init(void);
94extern void prio_tree_init(void); 94extern void prio_tree_init(void);
95extern void radix_tree_init(void); 95extern void radix_tree_init(void);
96extern void free_initmem(void); 96extern void free_initmem(void);
97extern void prepare_namespace(void);
98#ifdef CONFIG_ACPI 97#ifdef CONFIG_ACPI
99extern void acpi_early_init(void); 98extern void acpi_early_init(void);
100#else 99#else