Rename the MODULE_*_HOOK() macros to MODULE_HOOK_*() as briefly

discussed on irc.

NFCI intended.

Ride the earlier kernel bump - it;s getting crowded.

sys/arch/amd64/amd64/netbsd32_machdep.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.118 2019/01/27 02:08:37 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.119 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.118 2019/01/27 02:08:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.119 2019/03/01 11:06:55 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -280,7 +280,7 @@ void
 netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
 {
 
-	MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook, (ksi, mask),
+	MODULE_HOOK_CALL_VOID(netbsd32_sendsig_hook, (ksi, mask),
 	    netbsd32_sendsig_siginfo(ksi, mask));
 }
 
@@ -981,12 +981,12 @@ void
 netbsd32_machdep_md_init(void)
 {
 
-	MODULE_SET_HOOK(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
+	MODULE_HOOK_SET(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
 }
 
 void
 netbsd32_machdep_md_fini(void)
 {
 
-	MODULE_UNSET_HOOK(netbsd32_machine32_hook);
+	MODULE_HOOK_UNSET(netbsd32_machine32_hook);
 }

sys/arch/amd64/amd64/netbsd32_machdep_16.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:37 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -251,12 +251,12 @@ void
 netbsd32_machdep_md_16_init(void)
 {
 
-	MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
+	MODULE_HOOK_SET(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
 }
 
 void
 netbsd32_machdep_md_16_fini(void)
 {
 
-	MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
+	MODULE_HOOK_UNSET(netbsd32_sendsig_hook);
 }

sys/arch/amd64/conf/GENERIC

@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.518 2019/03/01 08:17:51 nonaka Exp $
+# $NetBSD: GENERIC,v 1.519 2019/03/01 11:06:55 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.518 $"
+#ident		"GENERIC-$Revision: 1.519 $"
 
 maxusers	64		# estimated number of users
 
@@ -1092,7 +1092,7 @@ hvs*		at vmbus?		# Hyper-V StorVSC
 hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
 hvshutdown*	at vmbus?		# Hyper-V Geust Shutdown Service
 hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
-hvkvp*		at vmbus?		# Hyper-V Data Exchange Service
+#hvkvp*		at vmbus?		# Hyper-V Data Exchange Service
 
 # Pull in optional local configuration
 cinclude "arch/amd64/conf/GENERIC.local"

sys/arch/mips/mips/netbsd32_machdep.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.17 2019/01/27 02:08:38 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.18 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.17 2019/01/27 02:08:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.18 2019/03/01 11:06:55 pgoyette Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_coredump.h"
@@ -314,7 +314,7 @@ void
 netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
 {
 
-	MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook, (ksi, mask),  
+	MODULE_HOOK_CALL_VOID(netbsd32_sendsig_hook, (ksi, mask),  
 	    netbsd32_sendsig_siginfo(ksi, mask));
 }
 
@@ -329,14 +329,14 @@ void
 netbsd32_machdep_md_init(void) 
 {
 
-	MODULE_SET_HOOK(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
+	MODULE_HOOK_SET(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
 }
 
 void
 netbsd32_machdep_md_fini(void)
 {
 
-	MODULE_UNSET_HOOK(netbsd32_machine32_hook);
+	MODULE_HOOK_UNSET(netbsd32_machine32_hook);
 }
 
 

sys/arch/mips/mips/netbsd32_machdep_16.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:38 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_coredump.h"
@@ -99,12 +99,12 @@ void
 netbsd32_machdep_md_16_init(void)
 {       
 
-	MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16); 
+	MODULE_HOOK_SET(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16); 
 }               
 
 void            
 netbsd32_machdep_md_16_fini(void)
 {       
 
-	MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
+	MODULE_HOOK_UNSET(netbsd32_sendsig_hook);
 }

sys/arch/sparc/fpu/fpu.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.28 2019/01/27 02:08:38 pgoyette Exp $ */
+/*	$NetBSD: fpu.c,v 1.29 2019/03/01 11:06:55 pgoyette Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.28 2019/01/27 02:08:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.29 2019/03/01 11:06:55 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -144,7 +144,7 @@ fpu_cleanup(
 	int ret;
 	const struct emul *sunos_emul;
 
-	MODULE_CALL_HOOK(get_emul_sunos_hook, (&sunos_emul), enosys(), ret);
+	MODULE_HOOK_CALL(get_emul_sunos_hook, (&sunos_emul), enosys(), ret);
 
 	if (ret == 0 && p->p_emul == sunos_emul)
 		fpu_codes = fpu_codes_sunos;

sys/arch/sparc64/sparc64/netbsd32_machdep.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.112 2019/01/27 02:08:38 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.113 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.112 2019/01/27 02:08:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.113 2019/03/01 11:06:55 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -267,7 +267,7 @@ void
 netbsd32_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
 {
 
-	MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook, (ksi, mask),
+	MODULE_HOOK_CALL_VOID(netbsd32_sendsig_hook, (ksi, mask),
 	    netbsd32_sendsig_siginfo(ksi, mask));
 }
 
@@ -1028,12 +1028,12 @@ void
 netbsd32_machdep_md_init(void) 
 {
 
-	MODULE_SET_HOOK(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
+	MODULE_HOOK_SET(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
 }
 
 void
 netbsd32_machdep_md_fini(void)
 {
 
-	MODULE_UNSET_HOOK(netbsd32_machine32_hook);
+	MODULE_HOOK_UNSET(netbsd32_machine32_hook);
 }

sys/arch/sparc64/sparc64/netbsd32_machdep_16.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:38 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.2 2019/01/27 02:08:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.3 2019/03/01 11:06:55 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -352,12 +352,12 @@ void
 netbsd32_machdep_md_16_init(void)
 {
 
-	MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
+	MODULE_HOOK_SET(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
 }
 
 void    
 netbsd32_machdep_md_16_fini(void)  
 {
 
-	MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
+	MODULE_HOOK_UNSET(netbsd32_sendsig_hook);
 }

sys/compat/common/bio_30.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bio_30.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/*	$NetBSD: bio_30.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $ */
 /*	$OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $	*/
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -96,12 +96,12 @@ void
 bio_30_init(void)
 {
 
-	MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
+	MODULE_HOOK_SET(compat_bio_30_hook, "bio_30", compat_30_bio);
 }
 
 void
 bio_30_fini(void)
 {
 
-	MODULE_UNSET_HOOK(compat_bio_30_hook);
+	MODULE_HOOK_UNSET(compat_bio_30_hook);
 }

sys/compat/common/ccd_60.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ccd_60.c,v 1.9 2019/01/27 03:00:48 christos Exp $	*/
+/*	$NetBSD: ccd_60.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.9 2019/01/27 03:00:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -95,12 +95,12 @@ void
 ccd_60_init(void)
 {
 
-	MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
+	MODULE_HOOK_SET(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
 }
 
 void
 ccd_60_fini(void)
 {
 
-	MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
+	MODULE_HOOK_UNSET(ccd_ioctl_60_hook);
 }

sys/compat/common/clockctl_50.c

@@ -1,4 +1,4 @@
-/*      $NetBSD: clockctl_50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/*      $NetBSD: clockctl_50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -130,13 +130,13 @@ void
 clockctl_50_init(void)
 {
 
-	MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50",
+	MODULE_HOOK_SET(clockctl_ioctl_50_hook, "clk_50",
 	    compat50_clockctlioctl);
 }
 
 void
 clockctl_50_fini(void)
 {
 
-	MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
+	MODULE_HOOK_UNSET(clockctl_ioctl_50_hook);
 }

sys/compat/common/compat_sysv_50_mod.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $	*/
+/*	$NetBSD: compat_sysv_50_mod.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -75,7 +75,7 @@ compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
 		if (error != 0) {
 			break;
 		}
-		MODULE_SET_HOOK(sysvipc_sysctl_50_hook, "sysv50",
+		MODULE_HOOK_SET(sysvipc_sysctl_50_hook, "sysv50",
 		    sysctl_kern_sysvipc50);
 		break;
 
@@ -84,7 +84,7 @@ compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
 		if (error != 0) {
 			break;
 		}
-		MODULE_UNSET_HOOK(sysvipc_sysctl_50_hook);
+		MODULE_HOOK_UNSET(sysvipc_sysctl_50_hook);
 		break;
 
 	default: