Module Name:    src
Committed By:   pgoyette
Date:           Sat Sep 29 21:36:15 UTC 2018

Modified Files:
        src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
        src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
        src/sys/compat/common [pgoyette-compat]: if_43.c
        src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_module.c
        src/sys/dev [pgoyette-compat]: bio.c ccd.c clockctl.c vnd.c
        src/sys/dev/raidframe [pgoyette-compat]: rf_netbsdkintf.c
        src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
        src/sys/dev/usb [pgoyette-compat]: ugen.c uhid.c usb.c
        src/sys/dev/wscons [pgoyette-compat]: wsevent.c
        src/sys/fs/puffs [pgoyette-compat]: puffs_msgif.c
        src/sys/kern [pgoyette-compat]: kern_proc.c sys_module.c
        src/sys/net [pgoyette-compat]: if.c if_spppsubr.c rtsock.c
        src/sys/net80211 [pgoyette-compat]: ieee80211_ioctl.c
        src/sys/opencrypto [pgoyette-compat]: cryptodev.c
        src/sys/sys [pgoyette-compat]: module_hook.h

Log Message:
In MODULE_HOOK_CALL_DECL we don't need to provide the actual argument
list for calling the hook function, nor do we need to provide the
default value (for when the hook has not been set).


To generate a diff of this commit:
cvs rdiff -u -r1.115.2.10 -r1.115.2.11 \
    src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.6 -r1.15.2.7 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.14.2.5 -r1.14.2.6 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.6.2.8 -r1.6.2.9 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.13.16.4 -r1.13.16.5 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.7 -r1.175.2.8 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.7 -r1.35.14.8 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.6 -r1.263.2.7 src/sys/dev/vnd.c
cvs rdiff -u -r1.356.2.5 -r1.356.2.6 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.58.2.4 -r1.58.2.5 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.139.2.4 -r1.139.2.5 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.4 -r1.101.2.5 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.5 -r1.168.2.6 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.5 -r1.37.2.6 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.101.10.5 -r1.101.10.6 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.209.2.6 -r1.209.2.7 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.23.2.12 -r1.23.2.13 src/sys/kern/sys_module.c
cvs rdiff -u -r1.419.2.13 -r1.419.2.14 src/sys/net/if.c
cvs rdiff -u -r1.179.2.6 -r1.179.2.7 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.238.2.9 -r1.238.2.10 src/sys/net/rtsock.c
cvs rdiff -u -r1.60.16.3 -r1.60.16.4 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.98.2.6 -r1.98.2.7 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/sys/module_hook.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.10 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.11
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.10	Sat Sep 29 07:34:12 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c	Sat Sep 29 21:36:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.115.2.10 2018/09/29 07:34:12 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.115.2.11 2018/09/29 21:36:13 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.115.2.10 2018/09/29 07:34:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.11 2018/09/29 21:36:13 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -276,8 +276,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
 struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
 
 MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
-    (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
-    netbsd32_sendsig_siginfo(ksi, mask));
+    (const ksiginfo_t *ksi, const sigset_t *mask));
 MODULE_CALL_HOOK(netbsd32_sendsig_hook, f,
     (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
     netbsd32_sendsig_siginfo(ksi, mask));

Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.6 src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.7
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.6	Sat Sep 29 10:22:36 2018
+++ src/sys/arch/mips/mips/netbsd32_machdep.c	Sat Sep 29 21:36:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.15.2.6 2018/09/29 10:22:36 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.15.2.7 2018/09/29 21:36:13 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.15.2.6 2018/09/29 10:22:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.7 2018/09/29 21:36:13 pgoyette Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_coredump.h"
@@ -310,8 +310,7 @@ cpu_coredump32(struct lwp *l, struct cor
 struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
  
 MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
-    (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
-    netbsd32_sendsig_siginfo(ksi, mask));
+    (const ksiginfo_t *ksi, const sigset_t *mask));
 MODULE_CALL_HOOK(netbsd32_sendsig_hook, f,
     (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),  
     netbsd32_sendsig_siginfo(ksi, mask));

Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.5 src/sys/compat/common/if_43.c:1.14.2.6
--- src/sys/compat/common/if_43.c:1.14.2.5	Fri Sep 21 02:56:22 2018
+++ src/sys/compat/common/if_43.c	Sat Sep 29 21:36:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_43.c,v 1.14.2.5 2018/09/21 02:56:22 pgoyette Exp $	*/
+/*	$NetBSD: if_43.c,v 1.14.2.6 2018/09/29 21:36:13 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.5 2018/09/21 02:56:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.6 2018/09/29 21:36:13 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
  * XXX The if43_20 routine doesn't really have any effect, since its
  * XXX return value is ignored (see compat/common/if_43.c)!
  */
-MODULE_CALL_HOOK_DECL(if43_20_hook, f, (u_long ncmd), (ncmd), enosys());
+MODULE_CALL_HOOK_DECL(if43_20_hook, f, (u_long ncmd));
 MODULE_CALL_HOOK(if43_20_hook, f, (u_long ncmd), (ncmd), enosys());
 
 /* 

Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.8 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.9
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.8	Tue Sep 18 23:03:54 2018
+++ src/sys/compat/netbsd32/netbsd32_module.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_module.c,v 1.6.2.9 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.9 2018/09/29 21:36:14 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -203,9 +203,7 @@ compat32_80_modctl_compat_stub(struct lw
 /* Module hook for netbsd32_80_modctl */
 MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook, f,
     (struct lwp *lwp, const struct netbsd32_modctl_args *uap,
-      register_t *result),
-    (lwp, uap, result),
-    enosys());
+      register_t *result));
 MODULE_CALL_HOOK(compat32_80_modctl_hook, f,
     (struct lwp *lwp, const struct netbsd32_modctl_args *uap,
       register_t *result),

Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.13.16.4 src/sys/dev/bio.c:1.13.16.5
--- src/sys/dev/bio.c:1.13.16.4	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/bio.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/*	$NetBSD: bio.c,v 1.13.16.5 2018/09/29 21:36:14 pgoyette Exp $ */
 /*	$OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
 /* A device controller ioctl tunnelling device.  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.5 2018/09/29 21:36:14 pgoyette Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -116,8 +116,7 @@ bioclose(dev_t dev, int flags, int mode,
 
 /* Hook up the compat_bio_30 routine */
 MODULE_CALL_HOOK_DECL(compat_bio_30_hook, f,
-    (void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
-    (cookie, cmd, addr, ff), enosys());
+    (void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)));
 MODULE_CALL_HOOK(compat_bio_30_hook, f,
     (void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
     (cookie, cmd, addr, ff), enosys());

Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.175.2.7 src/sys/dev/ccd.c:1.175.2.8
--- src/sys/dev/ccd.c:1.175.2.7	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/ccd.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $	*/
+/*	$NetBSD: ccd.c,v 1.175.2.8 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.8 2018/09/29 21:36:14 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -1063,8 +1063,7 @@ ccdread(dev_t dev, struct uio *uio, int 
  */
 MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
     int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
-					 struct lwp *)),
-    (dev, cmd, data, flag, l, ccdioctl), enosys());
+					 struct lwp *)));
 MODULE_CALL_HOOK(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
     int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
 					 struct lwp *)),

Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.7 src/sys/dev/clockctl.c:1.35.14.8
--- src/sys/dev/clockctl.c:1.35.14.7	Thu Sep 27 03:07:21 2018
+++ src/sys/dev/clockctl.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockctl.c,v 1.35.14.7 2018/09/27 03:07:21 pgoyette Exp $ */
+/*      $NetBSD: clockctl.c,v 1.35.14.8 2018/09/29 21:36:14 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.7 2018/09/27 03:07:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.8 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ntp.h"
@@ -202,8 +202,7 @@ clockctl_modcmd(modcmd_t cmd, void *data
 
 /* Hook the compat_50 stuff */
 MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook, f,
-    (dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
-    (dev, cmd, data, flags, l), enosys());
+    (dev_t dev, u_long cmd, void *data, int flags, struct lwp *l));
 MODULE_CALL_HOOK(clockctl_ioctl_50_hook, f,
     (dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
     (dev, cmd, data, flags, l), enosys());

Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.263.2.6 src/sys/dev/vnd.c:1.263.2.7
--- src/sys/dev/vnd.c:1.263.2.6	Wed Sep 19 04:12:43 2018
+++ src/sys/dev/vnd.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.263.2.6 2018/09/19 04:12:43 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.263.2.7 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.6 2018/09/19 04:12:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.7 2018/09/29 21:36:14 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -1113,9 +1113,7 @@ vndioctl_get(struct lwp *l, void *data, 
 
 MODULE_CALL_HOOK_DECL(compat_vndioctl_30_hook, f,
     (u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
-     int (*ff)(struct lwp *, void *, int, struct vattr *)),
-    (cmd, l, data, unit, vattr, ff),
-    enosys());
+     int (*ff)(struct lwp *, void *, int, struct vattr *)));
 MODULE_CALL_HOOK(compat_vndioctl_30_hook, f,
     (u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
      int (*ff)(struct lwp *, void *, int, struct vattr *)),
@@ -1124,9 +1122,7 @@ MODULE_CALL_HOOK(compat_vndioctl_30_hook
 
 MODULE_CALL_HOOK_DECL(compat_vndioctl_50_hook, f,
     (u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
-     int (*ff)(struct lwp *, void *, int, struct vattr *)),
-    (cmd, l, data, unit, vattr, ff),
-    enosys());
+     int (*ff)(struct lwp *, void *, int, struct vattr *)));
 MODULE_CALL_HOOK(compat_vndioctl_50_hook, f,
     (u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
      int (*ff)(struct lwp *, void *, int, struct vattr *)),

Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.5 src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.6
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.5	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.356.2.6 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.6 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1040,9 +1040,7 @@ raid_detach_unlocked(struct raid_softc *
 /* Hooks to call the 5.0 and 8.0 ioctl compat code */
 MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook, f,
     (int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
-     RF_Config_t **k_cfg),
-    (cmd, initted, raidPtr, unit, data, k_cfg),
-    enosys());
+     RF_Config_t **k_cfg));
 MODULE_CALL_HOOK(raidframe50_ioctl_hook, f,
     (int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
      RF_Config_t **k_cfg),
@@ -1051,9 +1049,7 @@ MODULE_CALL_HOOK(raidframe50_ioctl_hook,
 
 MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook, f,
     (int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
-     RF_Config_t **k_cfg),
-    (cmd, initted, raidPtr, unit, data, k_cfg),
-    enosys());
+     RF_Config_t **k_cfg));
 MODULE_CALL_HOOK(raidframe80_ioctl_hook, f,
     (int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
      RF_Config_t **k_cfg),

Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.58.2.4 src/sys/dev/sysmon/sysmon_power.c:1.58.2.5
--- src/sys/dev/sysmon/sysmon_power.c:1.58.2.4	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/sysmon/sysmon_power.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $	*/
+/*	$NetBSD: sysmon_power.c,v 1.58.2.5 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.5 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -319,8 +319,7 @@ sysmon_power_event_queue_flush(void)
  * Call the compat hook function
  */
 MODULE_CALL_HOOK_DECL(compat_sysmon_power_40_hook, f,
-    (power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
-    (pev, pswitch, event), enosys());
+    (power_event_t *pev, struct sysmon_pswitch *pswitch, int event));
 MODULE_CALL_HOOK(compat_sysmon_power_40_hook, f,
     (power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
     (pev, pswitch, event), enosys());

Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.139.2.4 src/sys/dev/usb/ugen.c:1.139.2.5
--- src/sys/dev/usb/ugen.c:1.139.2.4	Tue Sep 18 23:03:55 2018
+++ src/sys/dev/usb/ugen.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: ugen.c,v 1.139.2.5 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.5 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1442,9 +1442,7 @@ ugen_get_alt_index(struct ugen_softc *sc
 MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
     (struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
       void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
-	size_t, int, int), int (*printBCD)(char *, size_t, int)),
-    (udev, addr, usedev, fill_devinfo_vp, printBCD),
-    enosys());
+	size_t, int, int), int (*printBCD)(char *, size_t, int)));
 
 Static int
 ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,

Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.101.2.4 src/sys/dev/usb/uhid.c:1.101.2.5
--- src/sys/dev/usb/uhid.c:1.101.2.4	Tue Sep 18 23:03:55 2018
+++ src/sys/dev/usb/uhid.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhid.c,v 1.101.2.4 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: uhid.c,v 1.101.2.5 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.4 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.5 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -516,9 +516,7 @@ uhidwrite(dev_t dev, struct uio *uio, in
 MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
     (struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
       void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
-	size_t, int, int), int (*printBCD)(char *, size_t, int)), 
-    (udev, addr, usedev, fill_devinfo_vp, printBCD),
-    enosys());
+	size_t, int, int), int (*printBCD)(char *, size_t, int)));
 
 int
 uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, void *addr,

Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.168.2.5 src/sys/dev/usb/usb.c:1.168.2.6
--- src/sys/dev/usb/usb.c:1.168.2.5	Tue Sep 18 23:03:55 2018
+++ src/sys/dev/usb/usb.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.168.2.5 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: usb.c,v 1.168.2.6 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.5 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.6 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -648,8 +648,7 @@ usbopen(dev_t dev, int flag, int mode, s
 
 /* Call hook for usbd30_fill_device_info_old() */
 MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f2,
-    (struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
-    (ue, ueo, uio), enosys());
+    (struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio));
 MODULE_CALL_HOOK(usb_subr_30_hook, f2,
     (struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
     (ue, ueo, uio), enosys());
@@ -730,9 +729,7 @@ usbclose(dev_t dev, int flag, int mode,
 MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
     (struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
       void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
-	size_t, int, int), int (*printBCD)(char *, size_t, int)),
-    (udev, addr, usedev, fill_devinfo_vp, printBCD),
-    enosys());
+	size_t, int, int), int (*printBCD)(char *, size_t, int)));
 MODULE_CALL_HOOK(usb_subr_30_hook, f1,
     (struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
       void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,

Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.37.2.5 src/sys/dev/wscons/wsevent.c:1.37.2.6
--- src/sys/dev/wscons/wsevent.c:1.37.2.5	Tue Sep 18 23:03:55 2018
+++ src/sys/dev/wscons/wsevent.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.37.2.5 2018/09/18 23:03:55 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.37.2.6 2018/09/29 21:36:14 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.5 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.6 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -190,8 +190,7 @@ wsevent_fini(struct wseventvar *ev)
 }
 
 MODULE_CALL_HOOK_DECL(wsevent_50_copyout_events_hook, f,
-    (const struct wscons_event *events, int cnt, struct uio *uio),
-    (events, cnt, uio), enosys());
+    (const struct wscons_event *events, int cnt, struct uio *uio));
 MODULE_CALL_HOOK(wsevent_50_copyout_events_hook, f,
     (const struct wscons_event *events, int cnt, struct uio *uio),
     (events, cnt, uio), enosys());

Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.101.10.5 src/sys/fs/puffs/puffs_msgif.c:1.101.10.6
--- src/sys/fs/puffs/puffs_msgif.c:1.101.10.5	Tue Sep 18 23:03:55 2018
+++ src/sys/fs/puffs/puffs_msgif.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_msgif.c,v 1.101.10.5 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: puffs_msgif.c,v 1.101.10.6 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.5 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.6 2018/09/29 21:36:14 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -326,16 +326,14 @@ puffs_getmsgid(struct puffs_mount *pmp)
 /* Routines to call the compat hooks */
 	/* Out-going */
 MODULE_CALL_HOOK_DECL(puffs50_compat_hook, f1,
-     (struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
-     (oreq, creqp, deltap), enosys());
+     (struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap));
 MODULE_CALL_HOOK(puffs50_compat_hook, f1,
      (struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
      (oreq, creqp, deltap), enosys());
 
 	/* Incoming */
 MODULE_CALL_HOOK_DECL(puffs50_compat_hook, f2,
-     (struct puffs_req *oreq, struct puffs_req *creqp),
-     (oreq, creqp), enosys());
+     (struct puffs_req *oreq, struct puffs_req *creqp));
 MODULE_CALL_HOOK(puffs50_compat_hook, f2,
      (struct puffs_req *oreq, struct puffs_req *creqp),
      (oreq, creqp), enosys());

Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.6 src/sys/kern/kern_proc.c:1.209.2.7
--- src/sys/kern/kern_proc.c:1.209.2.6	Sun Sep 23 11:50:03 2018
+++ src/sys/kern/kern_proc.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.209.2.7 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.7 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1858,12 +1858,12 @@ sysctl_doeproc(SYSCTLFN_ARGS)
  */
 #if !defined(_RUMPKERNEL)
 MODULE_CALL_HOOK_DECL(kern_proc_32_hook, f1,
-    (struct proc *p, struct ps_strings *s), (p, s), enosys());
+    (struct proc *p, struct ps_strings *s));
 MODULE_CALL_HOOK(kern_proc_32_hook, f1,
     (struct proc *p, struct ps_strings *s), (p, s), enosys());
 
 MODULE_CALL_HOOK_DECL(kern_proc_32_hook, f2,
-    (char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
+    (char **argv, size_t i, vaddr_t *base));
 MODULE_CALL_HOOK(kern_proc_32_hook, f2,
     (char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
 #endif /* !defined(_RUMPKERNEL) */

Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.23.2.12 src/sys/kern/sys_module.c:1.23.2.13
--- src/sys/kern/sys_module.c:1.23.2.12	Tue Sep 18 23:03:55 2018
+++ src/sys/kern/sys_module.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_module.c,v 1.23.2.12 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: sys_module.c,v 1.23.2.13 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.12 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.13 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -263,7 +263,7 @@ handle_modctl_stat(struct iovec *iov, vo
 
 /* MODULE_HOOK glue for modstat_80 */
 MODULE_CALL_HOOK_DECL(compat_modstat_80_hook, f,
-    (int cmd, struct iovec *iov, void *arg), (cmd, iov, arg), enosys());
+    (int cmd, struct iovec *iov, void *arg));
 MODULE_CALL_HOOK(compat_modstat_80_hook, f,
     (int cmd, struct iovec *iov, void *arg), (cmd, iov, arg), enosys());
 

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.419.2.13 src/sys/net/if.c:1.419.2.14
--- src/sys/net/if.c:1.419.2.13	Fri Sep 21 02:56:22 2018
+++ src/sys/net/if.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.419.2.13 2018/09/21 02:56:22 pgoyette Exp $	*/
+/*	$NetBSD: if.c,v 1.419.2.14 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.13 2018/09/21 02:56:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.14 2018/09/29 21:36:14 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -3105,23 +3105,22 @@ out:
  * Interface for calling the compat routines
  */
 MODULE_CALL_HOOK_DECL(uipc_syscalls_40_hook, f,
-    (struct lwp *l, int cmd, void *data), (cmd, data), enosys());
+    (struct lwp *l, int cmd, void *data));
 MODULE_CALL_HOOK(uipc_syscalls_40_hook, f,
     (struct lwp *l, int cmd, void *data), (cmd, data), enosys());
 
 MODULE_CALL_HOOK_DECL(uipc_syscalls_50_hook, f,
-    (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys());
+    (struct lwp *l, int cmd, void *data));
 MODULE_CALL_HOOK(uipc_syscalls_50_hook, f,
     (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys());
 
 MODULE_CALL_HOOK_DECL(if_43_hook, f1,
-    (u_long *ncmd, u_long ocmd), (ncmd, ocmd), enosys());
+    (u_long *ncmd, u_long ocmd));
 MODULE_CALL_HOOK(if_43_hook, f1,
     (u_long *ncmd, u_long ocmd), (ncmd, ocmd), enosys());
 
 MODULE_CALL_HOOK_DECL(if_43_hook, f2,
-    (struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l),
-    (so, ocmd, cmd, data, l), enosys());
+    (struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l));
 MODULE_CALL_HOOK(if_43_hook, f2,
     (struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l),
     (so, ocmd, cmd, data, l), enosys());

Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.179.2.6 src/sys/net/if_spppsubr.c:1.179.2.7
--- src/sys/net/if_spppsubr.c:1.179.2.6	Tue Sep 18 23:03:55 2018
+++ src/sys/net/if_spppsubr.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.179.2.6 2018/09/18 23:03:55 pgoyette Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.179.2.7 2018/09/29 21:36:14 pgoyette Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.6 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.7 2018/09/29 21:36:14 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -5613,7 +5613,7 @@ sppp_suggest_ip6_addr(struct sppp *sp, s
 
 /* Hook the sppp_params50 compat code */
 MODULE_CALL_HOOK_DECL(sppp_params_50_hook, f,
-    (struct sppp *sp, u_long cmd, void *data), (sp, cmd, data), enosys());
+    (struct sppp *sp, u_long cmd, void *data));
 MODULE_CALL_HOOK(sppp_params_50_hook, f,
     (struct sppp *sp, u_long cmd, void *data), (sp, cmd, data), enosys());
 

Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.238.2.9 src/sys/net/rtsock.c:1.238.2.10
--- src/sys/net/rtsock.c:1.238.2.9	Tue Sep 18 23:03:55 2018
+++ src/sys/net/rtsock.c	Sat Sep 29 21:36:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.238.2.9 2018/09/18 23:03:55 pgoyette Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.238.2.10 2018/09/29 21:36:14 pgoyette Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.9 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.10 2018/09/29 21:36:14 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1383,16 +1383,14 @@ COMPATNAME(rt_missmsg)(int type, const s
  * COMPAT_xx options and we would otherwise end up with duplicate
  * global symbols.
  */
-MODULE_CALL_HOOK_DECL(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
+MODULE_CALL_HOOK_DECL(rtsock14_hook, f1, (struct ifnet *ifp));
 #ifndef COMPAT_RTSOCK
 MODULE_CALL_HOOK(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
 #endif
 
 MODULE_CALL_HOOK_DECL(rtsock14_hook, f2,
     (struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
-     size_t len),
-    (ifp, w, info, len),
-    enosys());
+     size_t len));
 #ifndef COMPAT_RTSOCK
 MODULE_CALL_HOOK(rtsock14_hook, f2,
     (struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,

Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.60.16.3 src/sys/net80211/ieee80211_ioctl.c:1.60.16.4
--- src/sys/net80211/ieee80211_ioctl.c:1.60.16.3	Fri Sep 21 03:42:20 2018
+++ src/sys/net80211/ieee80211_ioctl.c	Sat Sep 29 21:36:15 2018
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.16.3 2018/09/21 03:42:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.16.4 2018/09/29 21:36:15 pgoyette Exp $");
 #endif
 
 /*
@@ -2560,8 +2560,7 @@ ieee80211_ioctl(struct ieee80211com *ic,
  * Compatability glue
  */
 MODULE_CALL_HOOK_DECL(ieee80211_ostats_hook, f,
-    (struct ieee80211_ostats *ostats, struct ieee80211_stats *stats),
-    (ostats, stats), enosys());
+    (struct ieee80211_ostats *ostats, struct ieee80211_stats *stats));
 MODULE_CALL_HOOK(ieee80211_ostats_hook, f,
     (struct ieee80211_ostats *ostats, struct ieee80211_stats *stats),
     (ostats, stats), enosys());

Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.98.2.6 src/sys/opencrypto/cryptodev.c:1.98.2.7
--- src/sys/opencrypto/cryptodev.c:1.98.2.6	Sun Sep 23 01:33:26 2018
+++ src/sys/opencrypto/cryptodev.c	Sat Sep 29 21:36:15 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptodev.c,v 1.98.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
+/*	$NetBSD: cryptodev.c,v 1.98.2.7 2018/09/29 21:36:15 pgoyette Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $	*/
 /*	$OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $	*/
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.6 2018/09/23 01:33:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.7 2018/09/29 21:36:15 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -228,7 +228,7 @@ cryptof_write(file_t *fp, off_t *poff,
  * code cannot directly reference them as globals.
  */
 MODULE_CALL_HOOK_DECL(ocryptof_50_hook, f,
-    (struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
+    (struct file *fp, u_long cmd, void *data));
 MODULE_CALL_HOOK(ocryptof_50_hook, f,
     (struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
 

Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.3 src/sys/sys/module_hook.h:1.1.2.4
--- src/sys/sys/module_hook.h:1.1.2.3	Sun Sep 23 10:41:01 2018
+++ src/sys/sys/module_hook.h	Sat Sep 29 21:36:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.3 2018/09/23 10:41:01 pgoyette Exp $	*/
+/* $NetBSD: module_hook.h,v 1.1.2.4 2018/09/29 21:36:15 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -161,7 +161,7 @@ static void (hook ## _unset)(void)				\
 	pserialize_destroy(hook.psz);				\
 }
 
-#define MODULE_CALL_HOOK_DECL(hook, which, decl, args, default)	\
+#define MODULE_CALL_HOOK_DECL(hook, which, decl)		\
 int								\
 hook ## _ ## which ## _call decl;
 #define MODULE_CALL_HOOK(hook, which, decl, args, default)	\

Reply via email to