aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-02-23 22:59:53 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-02-23 22:59:53 +0000
commit1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f (patch)
tree0a83cfa5ea98e519ade4fa7f4e8a859e26bd737c /target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch
parentad077832bfb03106a02b7be02b560c13e77d0436 (diff)
downloadupstream-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.tar.gz
upstream-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.tar.bz2
upstream-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.zip
generic: early (incomplete!) 4.0 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 44511
Diffstat (limited to 'target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch')
-rw-r--r--target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch
new file mode 100644
index 0000000000..7d28e02f4e
--- /dev/null
+++ b/target/linux/generic/patches-4.0/000-keep_initrafs_the_default.patch
@@ -0,0 +1,25 @@
+Upstream changed the default rootfs to tmpfs when none has been passed
+to the kernel - this doesn't fit our purposes, so change it back.
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -625,6 +625,7 @@ int __init init_rootfs(void)
+ if (err)
+ return err;
+
++#if 0
+ if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ (!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
+ err = shmem_init();
+@@ -632,6 +633,9 @@ int __init init_rootfs(void)
+ } else {
+ err = init_ramfs_fs();
+ }
++#else
++ err = init_ramfs_fs();
++#endif
+
+ if (err)
+ unregister_filesystem(&rootfs_fs_type);