aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 04:36:47 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:02 -0500
commit011e3fcd1e1f14ef54db30b93404ab7caa726477 (patch)
tree2d8b5dc618f370cb8f2aafd16f15e324fca872bb
parentc166f23cb56a76983ce860739d95c8296e57d6b3 (diff)
proper prototype for get_filesystem_list()
Ad a proper prototype for migration_init() in include/linux/fs.h Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/proc/proc_misc.c1
-rw-r--r--include/linux/fs.h1
-rw-r--r--init/do_mounts.c3
3 files changed, 2 insertions, 3 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index c0a90954016f..383ff068ab2e 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -65,7 +65,6 @@
65 */ 65 */
66extern int get_hardware_list(char *); 66extern int get_hardware_list(char *);
67extern int get_stram_list(char *); 67extern int get_stram_list(char *);
68extern int get_filesystem_list(char *);
69extern int get_exec_domain_list(char *); 68extern int get_exec_domain_list(char *);
70extern int get_dma_list(char *); 69extern int get_dma_list(char *);
71 70
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 56bd421c1208..ed289a9c5ccb 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2113,6 +2113,7 @@ struct ctl_table;
2113int proc_nr_files(struct ctl_table *table, int write, struct file *filp, 2113int proc_nr_files(struct ctl_table *table, int write, struct file *filp,
2114 void __user *buffer, size_t *lenp, loff_t *ppos); 2114 void __user *buffer, size_t *lenp, loff_t *ppos);
2115 2115
2116int get_filesystem_list(char * buf);
2116 2117
2117#endif /* __KERNEL__ */ 2118#endif /* __KERNEL__ */
2118#endif /* _LINUX_FS_H */ 2119#endif /* _LINUX_FS_H */
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 1161dfd7b0d3..f86573126f83 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -11,6 +11,7 @@
11#include <linux/mount.h> 11#include <linux/mount.h>
12#include <linux/device.h> 12#include <linux/device.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/fs.h>
14 15
15#include <linux/nfs_fs.h> 16#include <linux/nfs_fs.h>
16#include <linux/nfs_fs_sb.h> 17#include <linux/nfs_fs_sb.h>
@@ -18,8 +19,6 @@
18 19
19#include "do_mounts.h" 20#include "do_mounts.h"
20 21
21extern int get_filesystem_list(char * buf);
22
23int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ 22int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */
24 23
25int root_mountflags = MS_RDONLY | MS_SILENT; 24int root_mountflags = MS_RDONLY | MS_SILENT;