diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-06-14 18:17:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-06-14 18:17:47 +0000 |
commit | a7bea11085c99c96e55f06e425bd695948afa743 (patch) | |
tree | 049afc3b485c13c66171a376c5b3adeec7fd2597 /target/linux/generic/patches-4.0/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | |
parent | 1bb873c7d5929eb0c60c5b611e880f443ed90f5f (diff) | |
download | upstream-a7bea11085c99c96e55f06e425bd695948afa743.tar.gz upstream-a7bea11085c99c96e55f06e425bd695948afa743.tar.bz2 upstream-a7bea11085c99c96e55f06e425bd695948afa743.zip |
kernel: remove linux 4.0
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45975 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
-rw-r--r-- | target/linux/generic/patches-4.0/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/target/linux/generic/patches-4.0/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.0/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch deleted file mode 100644 index 406737e9cc..0000000000 --- a/target/linux/generic/patches-4.0/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 <daniel@makrotopia.org> -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 <daniel@makrotopia.org> ---- - 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); |