summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-22 12:27:59 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-22 12:27:59 +0000
commita0c49ef46f7caf5eb02c635d446218201008ecff (patch)
treea94180d50839c1587dfe845e8faf16405fab78ff /target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
parent518ab154e059c9f39684f8c78159c9caf333716b (diff)
downloadmaster-31e0f0ae-a0c49ef46f7caf5eb02c635d446218201008ecff.tar.gz
master-31e0f0ae-a0c49ef46f7caf5eb02c635d446218201008ecff.tar.bz2
master-31e0f0ae-a0c49ef46f7caf5eb02c635d446218201008ecff.zip
generic: add linux 4.1 support
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
Diffstat (limited to 'target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch')
-rw-r--r--target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch b/target/linux/generic/patches-4.1/000-keep_initrafs_the_default.patch
new file mode 100644
index 0000000000..5e56d4415d
--- /dev/null
+++ b/target/linux/generic/patches-4.1/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
+@@ -628,6 +628,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();
+@@ -635,6 +636,9 @@ int __init init_rootfs(void)
+ } else {
+ err = init_ramfs_fs();
+ }
++#else
++ err = init_ramfs_fs();
++#endif
+
+ if (err)
+ unregister_filesystem(&rootfs_fs_type);