aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-26 13:47:46 +0000
committerJohn Crispin <john@openwrt.org>2014-06-26 13:47:46 +0000
commitfbf8b288e1f318cb697f4a86cbe01b4b9573b82d (patch)
treeb955ff887aea2a971b9f6a69c12330b085791107 /target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
parent994e5ce2f93bf8beeb099a9fd38d1dc358005c30 (diff)
downloadupstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.gz
upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.bz2
upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.zip
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41352
Diffstat (limited to 'target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
-rw-r--r--target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index 75a0bc02ca..17aebf6ecd 100644
--- a/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
init/do_mounts.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..faba9c6 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -432,7 +432,27 @@ retry:
+@@ -428,7 +428,27 @@ retry:
out:
put_page(page);
}
@@ -42,7 +40,7 @@ index 82f2288..faba9c6 100644
#ifdef CONFIG_ROOT_NFS
#define NFSROOT_TIMEOUT_MIN 5
-@@ -526,6 +546,10 @@ void __init mount_root(void)
+@@ -522,6 +542,10 @@ void __init mount_root(void)
change_floppy("root floppy");
}
#endif
@@ -53,6 +51,3 @@ index 82f2288..faba9c6 100644
#ifdef CONFIG_BLOCK
create_dev("/dev/root", ROOT_DEV);
mount_block_root("/dev/root", root_mountflags);
---
-1.9.2
-