[src/pgoyette-compat]: src/sys/kern If a built-in module is "unloaded", relea...

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

details:   https://anonhg.NetBSD.org/src/rev/5b1c0c363085
branches:  pgoyette-compat
changeset: 830613:5b1c0c363085
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Sep 05 09:26:59 2018 +0000

description:
If a built-in module is "unloaded", release all the resources associated
with the "required" list.  The list will be re-parsed if the module is
later re-enabled.

diffstat:

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

diffs (37 lines):

diff -r 1f846c45a0b1 -r 5b1c0c363085 sys/kern/kern_module.c
--- a/sys/kern/kern_module.c    Wed Sep 05 08:58:03 2018 +0000
+++ b/sys/kern/kern_module.c    Wed Sep 05 09:26:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_module.c,v 1.130.2.16 2018/09/04 11:53:46 pgoyette Exp $  */
+/*     $NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 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.16 2018/09/04 11:53:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.17 2018/09/05 09:26:59 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -1406,8 +1406,16 @@
                kmem_free(mod->mod_required, mod->mod_arequired *
                    sizeof(module_t));
        if (mod->mod_source == MODULE_SOURCE_KERNEL) {
-               mod->mod_nrequired = 0; /* will be re-parsed */
-               mod->mod_arequired = 0;
+               if (mod_arequired != 0) {
+                       /*
+                        * release "required" resources - will be re-parsed
+                        * if the module is re-enabled
+                        */
+                       kmem_free(mod->mod_required,
+                           mod->mod_arequired * sizeof(module_t *));
+                       mod->mod_nrequired = 0;
+                       mod->mod_arequired = 0;
+               }
                if (load_requires_force)
                        module_require_force(mod);
                TAILQ_INSERT_TAIL(&module_builtins, mod, mod_chain);