[src/pgoyette-compat]: src/sys/kern Finish de-confliction

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

details:   https://anonhg.NetBSD.org/src/rev/7307b64851cb
branches:  pgoyette-compat
changeset: 320173:7307b64851cb
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Jun 25 08:50:10 2018 +0000

description:
Finish de-confliction

diffstat:

 sys/kern/kern_module.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r a3624653c95e -r 7307b64851cb sys/kern/kern_module.c
--- a/sys/kern/kern_module.c    Mon Jun 25 07:25:04 2018 +0000
+++ b/sys/kern/kern_module.c    Mon Jun 25 08:50:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_module.c,v 1.130.2.9 2018/06/25 07:22:54 pgoyette Exp $   */
+/*     $NetBSD: kern_module.c,v 1.130.2.10 2018/06/25 08:50:10 pgoyette Exp $  */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.9 2018/06/25 07:22:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.10 2018/06/25 08:50:10 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -1105,7 +1105,6 @@
 #endif
                        SLIST_REMOVE_HEAD(&pend_stack, pe_entry);
                        module_free(mod);
-                       depth--;
                        return error;
                }
                TAILQ_INSERT_TAIL(pending, mod, mod_chain);
@@ -1332,7 +1331,6 @@
        TAILQ_REMOVE(pending, mod, mod_chain);
        SLIST_REMOVE_HEAD(&pend_stack, pe_entry);
        module_free(mod);
-       depth--;
        return error;
 }