Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / init / do_mounts.h

diff --git a/init/do_mounts.h b/init/do_mounts.h
index 0bb0806..7a29ac3 100644 (file)
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -8,26 +8,16 @@
 #include <linux/mount.h>
 #include <linux/major.h>
 #include <linux/root_dev.h>
+#include <linux/init_syscalls.h>
 
-void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);
 extern int root_mountflags;
 
-static inline int create_dev(char *name, dev_t dev)
+static inline __init int create_dev(char *name, dev_t dev)
 {
-       ksys_unlink(name);
-       return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
-}
-
-static inline u32 bstat(char *name)
-{
-       struct kstat stat;
-       if (vfs_stat(name, &stat) != 0)
-               return 0;
-       if (!S_ISBLK(stat.mode))
-               return 0;
-       return stat.rdev;
+       init_unlink(name);
+       return init_mknod(name, S_IFBLK | 0600, new_encode_dev(dev));
 }
 
 #ifdef CONFIG_BLK_DEV_RAM
@@ -51,13 +41,3 @@ bool __init initrd_load(void);
 static inline bool initrd_load(void) { return false; }
 
 #endif
-
-#ifdef CONFIG_BLK_DEV_MD
-
-void md_run_setup(void);
-
-#else
-
-static inline void md_run_setup(void) {}
-
-#endif