Commit 9b561322 authored by Kai Germaschewski's avatar Kai Germaschewski

do_mounts: Move CONFIG_BLK_DEV_RAM stuff into own file

There's still an #ifdef in there for CONFIG_BLK_DEV_INITRD, but at
some point it just gets too many files, so accept that for now.
There's also a #define BUILD_CRAMDISK in there, which should be either
made a config option or removed...
parent ec6051da
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
obj-y := main.o version.o do_mounts.o initramfs.o obj-y := main.o version.o do_mounts.o initramfs.o
obj-$(CONFIG_DEVFS_FS) += do_mounts_devfs.o obj-$(CONFIG_DEVFS_FS) += do_mounts_devfs.o
obj-$(CONFIG_BLK_DEV_MD)+= do_mounts_md.o obj-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
obj-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o
# files to be removed upon make clean # files to be removed upon make clean
clean-files := ../include/linux/compile.h clean-files := ../include/linux/compile.h
......
This diff is collapsed.
...@@ -6,16 +6,27 @@ ...@@ -6,16 +6,27 @@
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/blk.h>
#include <linux/root_dev.h>
asmlinkage long sys_unlink(const char *name); asmlinkage long sys_unlink(const char *name);
asmlinkage long sys_mknod(const char *name, int mode, dev_t dev); asmlinkage long sys_mknod(const char *name, int mode, dev_t dev);
asmlinkage long sys_newstat(char * filename, struct stat * statbuf); asmlinkage long sys_newstat(char * filename, struct stat * statbuf);
asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg); asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
asmlinkage long sys_mkdir(const char *name, int mode);
asmlinkage long sys_rmdir(const char *name);
asmlinkage long sys_chdir(const char *name);
asmlinkage long sys_fchdir(int fd);
asmlinkage long sys_chroot(const char *name);
asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type, asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type,
unsigned long flags, void *data); unsigned long flags, void *data);
asmlinkage long sys_umount(char *name, int flags); asmlinkage long sys_umount(char *name, int flags);
dev_t name_to_dev_t(char *name); dev_t name_to_dev_t(char *name);
void change_floppy(char *fmt, ...);
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
...@@ -26,7 +37,6 @@ int create_dev(char *name, dev_t dev, char *devfs_name); ...@@ -26,7 +37,6 @@ int create_dev(char *name, dev_t dev, char *devfs_name);
#else #else
static inline void mount_devfs(void) {} static inline void mount_devfs(void) {}
static inline void umount_devfs(const char *path) {} static inline void umount_devfs(const char *path) {}
static inline int create_dev(char *name, dev_t dev, char *devfs_name) static inline int create_dev(char *name, dev_t dev, char *devfs_name)
...@@ -37,6 +47,28 @@ static inline int create_dev(char *name, dev_t dev, char *devfs_name) ...@@ -37,6 +47,28 @@ static inline int create_dev(char *name, dev_t dev, char *devfs_name)
#endif #endif
#ifdef CONFIG_BLK_DEV_RAM
int __init rd_load_disk(int n);
int __init rd_load_image(char *from);
#else
static inline int rd_load_disk(int n) { return 0; }
static inline int rd_load_image(char *from) { return 0; }
#endif
#ifdef CONFIG_BLK_DEV_INITRD
int __init initrd_load(void);
#else
static inline int initrd_load(void) { return 0; }
#endif
#ifdef CONFIG_BLK_DEV_MD #ifdef CONFIG_BLK_DEV_MD
void md_run_setup(void); void md_run_setup(void);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment