From af69bf56b6810419879f1aecad8160697877a8c6 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Thu, 26 Mar 2015 09:42:59 +0000 Subject: drop 3.19 support Signed-off-by: Imre Kaloz SVN-Revision: 45002 --- ...-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch (limited to 'target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch') diff --git a/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch deleted file mode 100644 index 406737e9cc..0000000000 --- a/target/linux/generic/patches-3.19/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ /dev/null @@ -1,53 +0,0 @@ -From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Sat, 17 May 2014 03:35:02 +0200 -Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c -To: openwrt-devel@lists.openwrt.org - -Signed-off-by: Daniel Golle ---- - init/do_mounts.c | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - ---- a/init/do_mounts.c -+++ b/init/do_mounts.c -@@ -435,7 +435,27 @@ retry: - out: - put_page(page); - } -- -+ -+static int __init mount_ubi_rootfs(void) -+{ -+ int flags = MS_SILENT; -+ int err, tried = 0; -+ -+ while (tried < 2) { -+ err = do_mount_root("ubi0:rootfs", "ubifs", flags, \ -+ root_mount_data); -+ switch (err) { -+ case -EACCES: -+ flags |= MS_RDONLY; -+ tried++; -+ default: -+ return err; -+ } -+ } -+ -+ return -EINVAL; -+} -+ - #ifdef CONFIG_ROOT_NFS - - #define NFSROOT_TIMEOUT_MIN 5 -@@ -529,6 +549,10 @@ void __init mount_root(void) - change_floppy("root floppy"); - } - #endif -+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV -+ if (!mount_ubi_rootfs()) -+ return; -+#endif - #ifdef CONFIG_BLOCK - create_dev("/dev/root", ROOT_DEV); - mount_block_root("/dev/root", root_mountflags); -- cgit v1.2.3