[gentoo-commits] proj/linux-patches:3.16 commit in: /

[Mike Pagano]

commit:     eb0a44de4e660928fbf347dae020a3b6cde29d7b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 26 12:16:43 2014 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Aug 26 12:16:43 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/linux-patches.git;a=commit;h=eb0a44de

Update to correct double mount thanks to mgorny

---
 2900_dev-root-proc-mount-fix.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/2900_dev-root-proc-mount-fix.patch 
b/2900_dev-root-proc-mount-fix.patch
index 4c89adf..6ea86e2 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);