diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2014-08-26 08:16:43 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2014-08-26 08:16:43 -0400 |
| commit | eb0a44de4e660928fbf347dae020a3b6cde29d7b (patch) | |
| tree | 8f7812115cea0bad3c498a4010006c9108cbf152 | |
| parent | Linux patch 3.16.1 (diff) | |
| download | linux-patches-eb0a44de4e660928fbf347dae020a3b6cde29d7b.tar.gz linux-patches-eb0a44de4e660928fbf347dae020a3b6cde29d7b.tar.bz2 linux-patches-eb0a44de4e660928fbf347dae020a3b6cde29d7b.zip | |
Update to correct double mount thanks to mgorny
| -rw-r--r-- | 2900_dev-root-proc-mount-fix.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/2900_dev-root-proc-mount-fix.patch b/2900_dev-root-proc-mount-fix.patch index 4c89adfe..6ea86e29 100644 --- a/2900_dev-root-proc-mount-fix.patch +++ b/2900_dev-root-proc-mount-fix.patch @@ -1,6 +1,6 @@ ---- a/init/do_mounts.c 2013-01-25 19:11:11.609802424 -0500 -+++ b/init/do_mounts.c 2013-01-25 19:14:20.606053568 -0500 -@@ -461,7 +461,10 @@ void __init change_floppy(char *fmt, ... +--- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400 ++++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400 +@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ... va_start(args, fmt); vsprintf(buf, fmt, args); va_end(args); @@ -12,10 +12,11 @@ if (fd >= 0) { sys_ioctl(fd, FDEJECT, 0); sys_close(fd); -@@ -505,7 +508,13 @@ void __init mount_root(void) +@@ -527,8 +530,13 @@ void __init mount_root(void) + } #endif #ifdef CONFIG_BLOCK - create_dev("/dev/root", ROOT_DEV); +- create_dev("/dev/root", ROOT_DEV); - mount_block_root("/dev/root", root_mountflags); + if (saved_root_name[0]) { + create_dev(saved_root_name, ROOT_DEV); |