[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by manu...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/beb0bec8fb5b
branches:  netbsd-7
changeset: 800432:beb0bec8fb5b
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Feb 25 23:27:17 2018 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1573):
        sys/kern/subr_tftproot.c: 1.20
Fix md(4) double attachment in TFTPROOT option
The mdattach() call in tftproot_dhcpboot() has probably always been
useless, but it seems it became harmful, as it causes 7.1.1 to deadlock
during boot.

diffstat:

 sys/kern/subr_tftproot.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 875e0ff3a74d -r beb0bec8fb5b sys/kern/subr_tftproot.c
--- a/sys/kern/subr_tftproot.c  Sun Feb 25 23:17:47 2018 +0000
+++ b/sys/kern/subr_tftproot.c  Sun Feb 25 23:27:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $ */
+/*     $NetBSD: subr_tftproot.c,v 1.12.12.3 2018/02/25 23:27:17 snj Exp $ */
 
 /*-
  * Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
 #include "opt_md.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.12.12.3 2018/02/25 23:27:17 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -65,8 +65,6 @@
 #include <nfs/nfsdiskless.h>
 #include <nfs/nfs_var.h>
 
-extern void       mdattach(int);
-
 /* 
  * Copied from <lib/libsa/tftp.h> 
  */
@@ -333,7 +331,6 @@
        DPRINTF(("%s():%d RAMdisk loaded: %ld@%p\n", 
            __func__, __LINE__, trh->trh_len, trh->trh_base));
        md_root_setconf(trh->trh_base, trh->trh_len);
-       mdattach(0);
 
        error = 0;
 out: