initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled

[karo-tx-linux.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5d8d48fd0ee4cd792ae5accbad76d5804831511c..e27908b949d48cb2a208837e7eafbe11c7b00fc8 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -27,6 +27,7 @@
 #include <linux/fs_struct.h>
 #include <linux/slab.h>
 #include <linux/ramfs.h>
+#include <linux/shmem_fs.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -598,7 +599,8 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type,
        if (test_and_set_bit(0, &once))
                return ERR_PTR(-ENODEV);
 
-       return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+       return mount_nodev(fs_type, flags, data,
+               IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
 }
 
 static struct file_system_type rootfs_fs_type = {
@@ -614,7 +616,11 @@ int __init init_rootfs(void)
        if (err)
                return err;
 
-       err = init_ramfs_fs();
+       if (IS_ENABLED(CONFIG_TMPFS))
+               err = shmem_init();
+       else
+               err = init_ramfs_fs();
+
        if (err)
                unregister_filesystem(&rootfs_fs_type);