diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-26 13:47:46 +0000 |
| commit | a5a86f528d940531f3a24eb3c1b1e66fac492852 (patch) | |
| tree | 8b2d6f407b83ede3ebd2a3bb4f42970d5e8ea50a /target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | |
| parent | 994485877673c5eafe8626e28a805f6ce91cf609 (diff) | |
| download | upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.gz upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.bz2 upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.zip | |
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41352 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 9 |
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 - |