Module Name: src
Committed By: pgoyette
Date: Wed Jan 23 03:34:15 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep_16.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep_16.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep_16.c
src/sys/compat/common [pgoyette-compat]: bio_30.c ccd_60.c
clockctl_50.c compat_sysv_50_mod.c ieee80211_20.c if43_20.c if_43.c
if_spppsubr50.c kern_mod_80.c rndpseudo_50.c rtsock_14.c
rtsock_50.c rtsock_70.c sysmon_power_40.c tty_60.c
uipc_syscalls_40.c uipc_syscalls_50.c uipc_usrreq_70.c
usb_subr_30.c vfs_syscalls_10.c vnd_30.c vnd_50.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_50.c
netbsd32_compat_80.c netbsd32_kern_proc.c
src/sys/compat/sunos [pgoyette-compat]: sunos_mod.c
src/sys/compat/sunos32 [pgoyette-compat]: sunos32_mod.c
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c rf_compat80.c
src/sys/dev/wscons [pgoyette-compat]: wsevent_50.c
src/sys/fs/puffs [pgoyette-compat]: puffs_compat.c
src/sys/opencrypto [pgoyette-compat]: ocryptodev.c
src/sys/sys [pgoyette-compat]: module_hook.h
Log Message:
Convert the macros for setting and unsetting a hook to generate
in-line code rather than using an intermediary hook##set routine.
Hooks are set and unset only in one place, so the intermediary
routine provides no benefit. IMHO using the macro at the point-
of-call is more readable than using it elsewhere in the code and
then calling the generated intermediary routine (for which you
won't even find its declaration or definition unless you remember
to search for the HOOK_SET macro instead).
NFC intended, will verify with a bulk build and an atf test run.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 \
src/sys/arch/mips/mips/netbsd32_machdep_16.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/bio_30.c \
src/sys/compat/common/clockctl_50.c src/sys/compat/common/if43_20.c \
src/sys/compat/common/vfs_syscalls_10.c src/sys/compat/common/vnd_30.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/ccd_60.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_sysv_50_mod.c \
src/sys/compat/common/ieee80211_20.c src/sys/compat/common/vnd_50.c
cvs rdiff -u -r1.14.2.14 -r1.14.2.15 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/if_spppsubr50.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/common/kern_mod_80.c
cvs rdiff -u -r1.2.38.2 -r1.2.38.3 src/sys/compat/common/rndpseudo_50.c
cvs rdiff -u -r1.5.14.6 -r1.5.14.7 src/sys/compat/common/rtsock_14.c
cvs rdiff -u -r1.6.2.6 -r1.6.2.7 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.2.2.4 -r1.2.2.5 src/sys/compat/common/rtsock_70.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/sysmon_power_40.c
cvs rdiff -u -r1.4.16.6 -r1.4.16.7 src/sys/compat/common/tty_60.c
cvs rdiff -u -r1.15.2.12 -r1.15.2.13 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.3.56.12 -r1.3.56.13 src/sys/compat/common/uipc_syscalls_50.c
cvs rdiff -u -r1.1.20.5 -r1.1.20.6 src/sys/compat/common/uipc_usrreq_70.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/usb_subr_30.c
cvs rdiff -u -r1.32.16.15 -r1.32.16.16 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.3.28.2 -r1.3.28.3 src/sys/compat/sunos/sunos_mod.c
cvs rdiff -u -r1.3.28.2 -r1.3.28.3 src/sys/compat/sunos32/sunos32_mod.c
cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.2.2.4 -r1.2.2.5 src/sys/dev/raidframe/rf_compat80.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/wscons/wsevent_50.c
cvs rdiff -u -r1.4.16.5 -r1.4.16.6 src/sys/fs/puffs/puffs_compat.c
cvs rdiff -u -r1.11.2.7 -r1.11.2.8 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 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_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.11 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.12
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.11 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.11 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.12 2019/01/23 03:34:14 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.1.2.11 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.12 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -247,19 +247,16 @@ compat_16_netbsd32___sigreturn14(struct
return (EJUSTRETURN);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
Index: src/sys/arch/mips/mips/netbsd32_machdep_16.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.9 src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.10
--- src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.9 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2019/01/23 03:34:14 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.1.2.9 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2019/01/23 03:34:14 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -95,19 +95,16 @@ netbsd32_sendsig_16(const ksiginfo_t *ks
netbsd32_sendsig_siginfo(ksi, mask);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.5 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.6
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.5 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2019/01/23 03:34:14 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.1.2.5 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -348,19 +348,16 @@ compat_16_netbsd32___sigreturn14(struct
return (EJUSTRETURN);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
Index: src/sys/compat/common/bio_30.c
diff -u src/sys/compat/common/bio_30.c:1.1.2.4 src/sys/compat/common/bio_30.c:1.1.2.5
--- src/sys/compat/common/bio_30.c:1.1.2.4 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/bio_30.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bio_30.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: bio_30.c,v 1.1.2.5 2019/01/23 03:34:14 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.1.2.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -92,19 +92,16 @@ compat_30_bio(void *cookie, u_long cmd,
}
}
-MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
-MODULE_UNSET_HOOK(compat_bio_30_hook);
-
void
bio_30_init(void)
{
- compat_bio_30_hook_set();
+ MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
}
void
bio_30_fini(void)
{
- compat_bio_30_hook_unset();
+ MODULE_UNSET_HOOK(compat_bio_30_hook);
}
Index: src/sys/compat/common/clockctl_50.c
diff -u src/sys/compat/common/clockctl_50.c:1.1.2.4 src/sys/compat/common/clockctl_50.c:1.1.2.5
--- src/sys/compat/common/clockctl_50.c:1.1.2.4 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/clockctl_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl_50.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: clockctl_50.c,v 1.1.2.5 2019/01/23 03:34:14 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.1.2.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -126,19 +126,17 @@ compat50_clockctlioctl(dev_t dev, u_long
return (error);
}
-MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
-MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
-
void
clockctl_50_init(void)
{
- clockctl_ioctl_50_hook_set();
+ MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50",
+ compat50_clockctlioctl);
}
void
clockctl_50_fini(void)
{
- clockctl_ioctl_50_hook_unset();
+ MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
}
Index: src/sys/compat/common/if43_20.c
diff -u src/sys/compat/common/if43_20.c:1.1.2.4 src/sys/compat/common/if43_20.c:1.1.2.5
--- src/sys/compat/common/if43_20.c:1.1.2.4 Sun Sep 30 21:32:48 2018
+++ src/sys/compat/common/if43_20.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $ */
+/* $NetBSD: if43_20.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -79,19 +79,16 @@ if43_cvtcmd_20(u_long ncmd)
}
}
-MODULE_SET_HOOK(if43_20_hook, "if4320", if43_cvtcmd_20);
-MODULE_UNSET_HOOK(if43_20_hook);
-
void
if43_20_init(void)
{
- if43_20_hook_set();
+ MODULE_SET_HOOK(if43_20_hook, "if4320", if43_cvtcmd_20);
}
void
if43_20_fini(void)
{
- if43_20_hook_unset();
+ MODULE_UNSET_HOOK(if43_20_hook);
}
Index: src/sys/compat/common/vfs_syscalls_10.c
diff -u src/sys/compat/common/vfs_syscalls_10.c:1.1.2.4 src/sys/compat/common/vfs_syscalls_10.c:1.1.2.5
--- src/sys/compat/common/vfs_syscalls_10.c:1.1.2.4 Mon Oct 15 10:44:27 2018
+++ src/sys/compat/common/vfs_syscalls_10.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_10.c,v 1.1.2.4 2018/10/15 10:44:27 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls_10.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_10.c,v 1.1.2.4 2018/10/15 10:44:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_10.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -52,17 +52,14 @@ real_sys_openat_10(struct pathbuf **pb)
return (*pb == NULL ? ENOMEM : 0);
}
-MODULE_SET_HOOK(compat_10_openat_hook, "openat_10", real_sys_openat_10);
-MODULE_UNSET_HOOK(compat_10_openat_hook);
-
void vfs_syscalls_10_init(void)
{
- compat_10_openat_hook_set();
+ MODULE_SET_HOOK(compat_10_openat_hook, "openat_10", real_sys_openat_10);
}
void vfs_syscalls_10_fini(void)
{
- compat_10_openat_hook_unset();
+ MODULE_UNSET_HOOK(compat_10_openat_hook);
}
Index: src/sys/compat/common/vnd_30.c
diff -u src/sys/compat/common/vnd_30.c:1.1.2.4 src/sys/compat/common/vnd_30.c:1.1.2.5
--- src/sys/compat/common/vnd_30.c:1.1.2.4 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/vnd_30.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd_30.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: vnd_30.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -119,19 +119,16 @@ compat_30_vndioctl(u_long cmd, struct lw
return 0;
}
-MODULE_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
-MODULE_UNSET_HOOK(compat_vndioctl_30_hook);
-
void
vnd_30_init(void)
{
- compat_vndioctl_30_hook_set();
+ MODULE_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
}
void
vnd_30_fini(void)
{
- compat_vndioctl_30_hook_unset();
+ MODULE_UNSET_HOOK(compat_vndioctl_30_hook);
}
Index: src/sys/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.1.2.8 src/sys/compat/common/ccd_60.c:1.1.2.9
--- src/sys/compat/common/ccd_60.c:1.1.2.8 Tue Sep 18 23:03:54 2018
+++ src/sys/compat/common/ccd_60.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: ccd_60.c,v 1.1.2.9 2019/01/23 03:34:14 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.1.2.8 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.9 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -91,19 +91,16 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
}
}
-MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
-MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
-
void
ccd_60_init(void)
{
- ccd_ioctl_60_hook_set();
+ MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
}
void
ccd_60_fini(void)
{
- ccd_ioctl_60_hook_unset();
+ MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
}
Index: src/sys/compat/common/compat_sysv_50_mod.c
diff -u src/sys/compat/common/compat_sysv_50_mod.c:1.1.2.2 src/sys/compat/common/compat_sysv_50_mod.c:1.1.2.3
--- src/sys/compat/common/compat_sysv_50_mod.c:1.1.2.2 Mon Oct 15 22:06:16 2018
+++ src/sys/compat/common/compat_sysv_50_mod.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sysv_50_mod.c,v 1.1.2.2 2018/10/15 22:06:16 pgoyette Exp $ */
+/* $NetBSD: compat_sysv_50_mod.c,v 1.1.2.3 2019/01/23 03:34:14 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.1.2.2 2018/10/15 22:06:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -64,9 +64,6 @@ static const struct syscall_package comp
{ 0, 0, NULL }
};
-MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50", sysctl_kern_sysvipc50);
-MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
-
static int
compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
{
@@ -78,7 +75,8 @@ compat_sysv_50_modcmd(modcmd_t cmd, void
if (error != 0) {
break;
}
- sysvipc50_sysctl_hook_set();
+ MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50",
+ sysctl_kern_sysvipc50);
break;
case MODULE_CMD_FINI:
@@ -86,7 +84,7 @@ compat_sysv_50_modcmd(modcmd_t cmd, void
if (error != 0) {
break;
}
- sysvipc50_sysctl_hook_unset();
+ MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
break;
default:
Index: src/sys/compat/common/ieee80211_20.c
diff -u src/sys/compat/common/ieee80211_20.c:1.1.2.2 src/sys/compat/common/ieee80211_20.c:1.1.2.3
--- src/sys/compat/common/ieee80211_20.c:1.1.2.2 Fri Sep 21 03:42:20 2018
+++ src/sys/compat/common/ieee80211_20.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_20.c,v 1.1.2.2 2018/09/21 03:42:20 pgoyette Exp $ */
+/* $NetBSD: ieee80211_20.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -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_20.c,v 1.1.2.2 2018/09/21 03:42:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $");
#endif
/*
@@ -94,18 +94,16 @@ ieee80211_get_ostats(struct ieee80211_os
return 0;
}
-MODULE_SET_HOOK(ieee80211_ostats_hook, "ieee20", ieee80211_get_ostats);
-MODULE_UNSET_HOOK(ieee80211_ostats_hook);
-
void
ieee80211_20_init(void)
{
- ieee80211_ostats_hook_set();
+ MODULE_SET_HOOK(ieee80211_ostats_hook, "ieee20", ieee80211_get_ostats);
}
+
void
ieee80211_20_fini(void)
{
- ieee80211_ostats_hook_unset();
+ MODULE_UNSET_HOOK(ieee80211_ostats_hook);
}
Index: src/sys/compat/common/vnd_50.c
diff -u src/sys/compat/common/vnd_50.c:1.1.2.2 src/sys/compat/common/vnd_50.c:1.1.2.3
--- src/sys/compat/common/vnd_50.c:1.1.2.2 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/vnd_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd_50.c,v 1.1.2.2 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: vnd_50.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1.1.2.2 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -119,19 +119,16 @@ compat_50_vndioctl(u_long cmd, struct lw
return 0;
}
-MODULE_SET_HOOK(compat_vndioctl_50_hook, "vnd_50", compat_50_vndioctl);
-MODULE_UNSET_HOOK(compat_vndioctl_50_hook);
-
void
vnd_50_init(void)
{
- compat_vndioctl_50_hook_set();
+ MODULE_SET_HOOK(compat_vndioctl_50_hook, "vnd_50", compat_50_vndioctl);
}
void
vnd_50_fini(void)
{
- compat_vndioctl_50_hook_unset();
+ MODULE_UNSET_HOOK(compat_vndioctl_50_hook);
}
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.14 src/sys/compat/common/if_43.c:1.14.2.15
--- src/sys/compat/common/if_43.c:1.14.2.14 Tue Jan 22 07:42:40 2019
+++ src/sys/compat/common/if_43.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.14 2019/01/22 07:42:40 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.15 2019/01/23 03:34:14 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.14 2019/01/22 07:42:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.15 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -289,17 +289,12 @@ compat_ifioctl(struct socket *so, u_long
return error;
}
-MODULE_SET_HOOK(if_43_cvtcmd_hook, "if_43", do_compat_cvtcmd);
-MODULE_SET_HOOK(if_43_ifioctl_hook, "if_43", compat_ifioctl);
-MODULE_UNSET_HOOK(if_43_cvtcmd_hook);
-MODULE_UNSET_HOOK(if_43_ifioctl_hook);
-
int
if_43_init(void)
{
- if_43_cvtcmd_hook_set();
- if_43_ifioctl_hook_set();
+ MODULE_SET_HOOK(if_43_cvtcmd_hook, "if_43", do_compat_cvtcmd);
+ MODULE_SET_HOOK(if_43_ifioctl_hook, "if_43", compat_ifioctl);
return 0;
}
@@ -307,8 +302,8 @@ int
if_43_fini(void)
{
- if_43_cvtcmd_hook_unset();
- if_43_ifioctl_hook_unset();
+ MODULE_UNSET_HOOK(if_43_cvtcmd_hook);
+ MODULE_UNSET_HOOK(if_43_ifioctl_hook);
return 0;
}
#endif /* defined(COMPAT_43) */
Index: src/sys/compat/common/if_spppsubr50.c
diff -u src/sys/compat/common/if_spppsubr50.c:1.1.2.3 src/sys/compat/common/if_spppsubr50.c:1.1.2.4
--- src/sys/compat/common/if_spppsubr50.c:1.1.2.3 Tue Sep 18 23:03:54 2018
+++ src/sys/compat/common/if_spppsubr50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr50.c,v 1.1.2.4 2019/01/23 03:34:14 pgoyette Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.1.2.4 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -154,19 +154,16 @@ sppp_compat50_params(struct sppp *sp, u_
return 0;
}
-MODULE_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
-MODULE_UNSET_HOOK(sppp_params_50_hook);
-
void
if_spppsubr_50_init(void)
{
- sppp_params_50_hook_set();
+ MODULE_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
}
void
if_spppsubr_50_fini(void)
{
- sppp_params_50_hook_unset();
+ MODULE_UNSET_HOOK(sppp_params_50_hook);
}
Index: src/sys/compat/common/kern_mod_80.c
diff -u src/sys/compat/common/kern_mod_80.c:1.1.2.7 src/sys/compat/common/kern_mod_80.c:1.1.2.8
--- src/sys/compat/common/kern_mod_80.c:1.1.2.7 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/kern_mod_80.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mod_80.c,v 1.1.2.7 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: kern_mod_80.c,v 1.1.2.8 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.7 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.8 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -152,19 +152,16 @@ compat_80_modstat(int cmd, struct iovec
return error;
}
-MODULE_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
-MODULE_UNSET_HOOK(compat_modstat_80_hook);
-
void
kern_mod_80_init(void)
{
- compat_modstat_80_hook_set();
+ MODULE_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
}
void
kern_mod_80_fini(void)
{
- compat_modstat_80_hook_unset();
+ MODULE_UNSET_HOOK(compat_modstat_80_hook);
}
Index: src/sys/compat/common/rndpseudo_50.c
diff -u src/sys/compat/common/rndpseudo_50.c:1.2.38.2 src/sys/compat/common/rndpseudo_50.c:1.2.38.3
--- src/sys/compat/common/rndpseudo_50.c:1.2.38.2 Fri Oct 12 22:30:54 2018
+++ src/sys/compat/common/rndpseudo_50.c Wed Jan 23 03:34:14 2019
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo_50.c,v 1.2.38.2 2018/10/12 22:30:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo_50.c,v 1.2.38.3 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -121,19 +121,16 @@ compat_50_rnd_ioctl(struct file *fp, u_l
return ret;
}
-MODULE_SET_HOOK(rnd_ioctl_50_hook, "rnd_50", compat_50_rnd_ioctl);
-MODULE_UNSET_HOOK(rnd_ioctl_50_hook);
-
void
rndpseudo_50_init(void)
{
- rnd_ioctl_50_hook_set();
+ MODULE_SET_HOOK(rnd_ioctl_50_hook, "rnd_50", compat_50_rnd_ioctl);
}
void
rndpseudo_50_fini(void)
{
- rnd_ioctl_50_hook_unset();
+ MODULE_UNSET_HOOK(rnd_ioctl_50_hook);
}
Index: src/sys/compat/common/rtsock_14.c
diff -u src/sys/compat/common/rtsock_14.c:1.5.14.6 src/sys/compat/common/rtsock_14.c:1.5.14.7
--- src/sys/compat/common/rtsock_14.c:1.5.14.6 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/common/rtsock_14.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_14.c,v 1.5.14.6 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: rtsock_14.c,v 1.5.14.7 2019/01/23 03:34: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_14.c,v 1.5.14.6 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.5.14.7 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -173,23 +173,18 @@ compat_14_iflist(struct ifnet *ifp, stru
return 0;
}
-MODULE_SET_HOOK(rtsock_14_oifmsg_hook, "rts_14", compat_14_rt_oifmsg);
-MODULE_SET_HOOK(rtsock_14_iflist_hook, "rts_14", compat_14_iflist);
-MODULE_UNSET_HOOK(rtsock_14_oifmsg_hook);
-MODULE_UNSET_HOOK(rtsock_14_iflist_hook);
-
void
rtsock_14_init(void)
{
- rtsock_14_iflist_hook_set();
- rtsock_14_oifmsg_hook_set();
+ MODULE_SET_HOOK(rtsock_14_oifmsg_hook, "rts_14", compat_14_rt_oifmsg);
+ MODULE_SET_HOOK(rtsock_14_iflist_hook, "rts_14", compat_14_iflist);
}
void
rtsock_14_fini(void)
{
- rtsock_14_iflist_hook_unset();
- rtsock_14_oifmsg_hook_unset();
+ MODULE_UNSET_HOOK(rtsock_14_oifmsg_hook);
+ MODULE_UNSET_HOOK(rtsock_14_iflist_hook);
}
Index: src/sys/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.6.2.6 src/sys/compat/common/rtsock_50.c:1.6.2.7
--- src/sys/compat/common/rtsock_50.c:1.6.2.6 Tue Jan 15 22:27:07 2019
+++ src/sys/compat/common/rtsock_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.6.2.6 2019/01/15 22:27:07 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.6.2.7 2019/01/23 03:34: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_50.c,v 1.6.2.6 2019/01/15 22:27:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6.2.7 2019/01/23 03:34:14 pgoyette Exp $");
#define COMPAT_RTSOCK /* Use the COMPATNAME/COMPATCALL macros and the
* various other compat definitions - see
@@ -149,52 +149,32 @@ compat_50_iflist(struct ifnet *ifp, stru
return 0;
}
-MODULE_SET_HOOK(rtsock_50_iflist_hook, "rts_50", compat_50_iflist);
-MODULE_UNSET_HOOK(rtsock_50_iflist_hook);
-
-MODULE_SET_HOOK(rtsock_50_oifmsg_hook, "rts_50", compat_50_rt_oifmsg);
-MODULE_UNSET_HOOK(rtsock_50_oifmsg_hook);
-
-MODULE_SET_HOOK(rtsock_50_rt_missmsg_hook, "rts_50", compat_50_rt_missmsg);
-MODULE_UNSET_HOOK(rtsock_50_rt_missmsg_hook);
-
-MODULE_SET_HOOK(rtsock_50_rt_ifmsg_hook, "rts_50", compat_50_rt_ifmsg);
-MODULE_UNSET_HOOK(rtsock_50_rt_ifmsg_hook);
-
-MODULE_SET_HOOK(rtsock_50_rt_newaddrmsg_hook, "rts_50",
- compat_50_rt_newaddrmsg);
-MODULE_UNSET_HOOK(rtsock_50_rt_newaddrmsg_hook);
-
-MODULE_SET_HOOK(rtsock_50_rt_ifannouncemsg_hook, "rts_50",
- compat_50_rt_ifannouncemsg);
-MODULE_UNSET_HOOK(rtsock_50_rt_ifannouncemsg_hook);
-
-MODULE_SET_HOOK(rtsock_50_rt_ieee80211msg_hook, "rts_50",
- compat_50_rt_ieee80211msg);
-MODULE_UNSET_HOOK(rtsock_50_rt_ieee80211msg_hook);
-
void
rtsock_50_init(void)
{
- rtsock_50_iflist_hook_set();
- rtsock_50_oifmsg_hook_set();
- rtsock_50_rt_missmsg_hook_set();
- rtsock_50_rt_ifmsg_hook_set();
- rtsock_50_rt_newaddrmsg_hook_set();
- rtsock_50_rt_ifannouncemsg_hook_set();
- rtsock_50_rt_ieee80211msg_hook_set();
+ MODULE_SET_HOOK(rtsock_50_iflist_hook, "rts_50", compat_50_iflist);
+ MODULE_SET_HOOK(rtsock_50_oifmsg_hook, "rts_50", compat_50_rt_oifmsg);
+ MODULE_SET_HOOK(rtsock_50_rt_missmsg_hook, "rts_50",
+ compat_50_rt_missmsg);
+ MODULE_SET_HOOK(rtsock_50_rt_ifmsg_hook, "rts_50", compat_50_rt_ifmsg);
+ MODULE_SET_HOOK(rtsock_50_rt_newaddrmsg_hook, "rts_50",
+ compat_50_rt_newaddrmsg);
+ MODULE_SET_HOOK(rtsock_50_rt_ifannouncemsg_hook, "rts_50",
+ compat_50_rt_ifannouncemsg);
+ MODULE_SET_HOOK(rtsock_50_rt_ieee80211msg_hook, "rts_50",
+ compat_50_rt_ieee80211msg);
}
void
rtsock_50_fini(void)
{
- rtsock_50_iflist_hook_unset();
- rtsock_50_oifmsg_hook_unset();
- rtsock_50_rt_missmsg_hook_unset();
- rtsock_50_rt_ifmsg_hook_unset();
- rtsock_50_rt_newaddrmsg_hook_unset();
- rtsock_50_rt_ifannouncemsg_hook_unset();
- rtsock_50_rt_ieee80211msg_hook_unset();
+ MODULE_UNSET_HOOK(rtsock_50_iflist_hook);
+ MODULE_UNSET_HOOK(rtsock_50_oifmsg_hook);
+ MODULE_UNSET_HOOK(rtsock_50_rt_missmsg_hook);
+ MODULE_UNSET_HOOK(rtsock_50_rt_ifmsg_hook);
+ MODULE_UNSET_HOOK(rtsock_50_rt_newaddrmsg_hook);
+ MODULE_UNSET_HOOK(rtsock_50_rt_ifannouncemsg_hook);
+ MODULE_UNSET_HOOK(rtsock_50_rt_ieee80211msg_hook);
}
Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.2.2.4 src/sys/compat/common/rtsock_70.c:1.2.2.5
--- src/sys/compat/common/rtsock_70.c:1.2.2.4 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/common/rtsock_70.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_70.c,v 1.2.2.4 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: rtsock_70.c,v 1.2.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2.2.4 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -115,23 +115,19 @@ compat_70_iflist_addr(struct rt_walkarg
return error;
}
-MODULE_SET_HOOK(rtsock_70_newaddr_hook, "rts_70", compat_70_rt_newaddrmsg1);
-MODULE_SET_HOOK(rtsock_70_iflist_hook, "rts_70", compat_70_iflist_addr);
-MODULE_UNSET_HOOK(rtsock_70_newaddr_hook);
-MODULE_UNSET_HOOK(rtsock_70_iflist_hook);
-
void
rtsock_70_init(void)
{
- rtsock_70_newaddr_hook_set();
- rtsock_70_iflist_hook_set();
+ MODULE_SET_HOOK(rtsock_70_newaddr_hook, "rts_70",
+ compat_70_rt_newaddrmsg1);
+ MODULE_SET_HOOK(rtsock_70_iflist_hook, "rts_70", compat_70_iflist_addr);
}
void
rtsock_70_fini(void)
{
- rtsock_70_newaddr_hook_unset();
- rtsock_70_iflist_hook_unset();
+ MODULE_UNSET_HOOK(rtsock_70_newaddr_hook);
+ MODULE_UNSET_HOOK(rtsock_70_iflist_hook);
}
Index: src/sys/compat/common/sysmon_power_40.c
diff -u src/sys/compat/common/sysmon_power_40.c:1.1.2.5 src/sys/compat/common/sysmon_power_40.c:1.1.2.6
--- src/sys/compat/common/sysmon_power_40.c:1.1.2.5 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/common/sysmon_power_40.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power_40.c,v 1.1.2.5 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: sysmon_power_40.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.5 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -91,20 +91,18 @@ compat_40_sysmon_power(power_event_t *pe
sizeof(pev->pev_switch.psws_name));
}
}
-
-MODULE_SET_HOOK(compat_sysmon_power_40_hook, "smon60", compat_40_sysmon_power);
-MODULE_UNSET_HOOK(compat_sysmon_power_40_hook);
void
sysmon_power_40_init(void)
{
- compat_sysmon_power_40_hook_set();
+ MODULE_SET_HOOK(compat_sysmon_power_40_hook, "smon60",
+ compat_40_sysmon_power);
}
void
sysmon_power_40_fini(void)
{
- compat_sysmon_power_40_hook_unset();
+ MODULE_UNSET_HOOK(compat_sysmon_power_40_hook);
}
Index: src/sys/compat/common/tty_60.c
diff -u src/sys/compat/common/tty_60.c:1.4.16.6 src/sys/compat/common/tty_60.c:1.4.16.7
--- src/sys/compat/common/tty_60.c:1.4.16.6 Sun Jan 13 10:49:49 2019
+++ src/sys/compat/common/tty_60.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_60.c,v 1.4.16.6 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: tty_60.c,v 1.4.16.7 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4.16.6 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4.16.7 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -118,26 +118,17 @@ compat_60_ptmioctl(dev_t dev, u_long cmd
}
}
-/*
- * Hooks for compat_60 ttioctl and ptmioctl
- */
-MODULE_SET_HOOK(compat_60_ttioctl_hook, "tty_60", compat_60_ttioctl);
-MODULE_SET_HOOK(compat_60_ptmioctl_hook, "tty_60", compat_60_ptmioctl);
-MODULE_UNSET_HOOK(compat_60_ttioctl_hook);
-MODULE_UNSET_HOOK(compat_60_ptmioctl_hook);
-
-
void
kern_tty_60_init(void)
{
- compat_60_ttioctl_hook_set();
- compat_60_ptmioctl_hook_set();
+ MODULE_SET_HOOK(compat_60_ttioctl_hook, "tty_60", compat_60_ttioctl);
+ MODULE_SET_HOOK(compat_60_ptmioctl_hook, "tty_60", compat_60_ptmioctl);
}
void
kern_tty_60_fini(void)
{
- compat_60_ttioctl_hook_unset();
- compat_60_ptmioctl_hook_unset();
+ MODULE_UNSET_HOOK(compat_60_ttioctl_hook);
+ MODULE_UNSET_HOOK(compat_60_ptmioctl_hook);
}
Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.15.2.12 src/sys/compat/common/uipc_syscalls_40.c:1.15.2.13
--- src/sys/compat/common/uipc_syscalls_40.c:1.15.2.12 Mon Oct 15 04:33:34 2018
+++ src/sys/compat/common/uipc_syscalls_40.c Wed Jan 23 03:34:14 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.15.2.12 2018/10/15 04:33:34 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.15.2.13 2019/01/23 03:34:14 pgoyette Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.12 2018/10/15 04:33:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.13 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -165,19 +165,16 @@ release_exit:
return error;
}
-MODULE_SET_HOOK(uipc_syscalls_40_hook, "uipc40", compat_ifconf);
-MODULE_UNSET_HOOK(uipc_syscalls_40_hook);
-
void
uipc_syscalls_40_init(void)
{
- uipc_syscalls_40_hook_set();
+ MODULE_SET_HOOK(uipc_syscalls_40_hook, "uipc40", compat_ifconf);
}
void
uipc_syscalls_40_fini(void)
{
- uipc_syscalls_40_hook_unset();
+ MODULE_UNSET_HOOK(uipc_syscalls_40_hook);
}
Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.3.56.12 src/sys/compat/common/uipc_syscalls_50.c:1.3.56.13
--- src/sys/compat/common/uipc_syscalls_50.c:1.3.56.12 Mon Oct 15 04:33:34 2018
+++ src/sys/compat/common/uipc_syscalls_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_50.c,v 1.3.56.12 2018/10/15 04:33:34 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_50.c,v 1.3.56.13 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -112,20 +112,17 @@ compat_ifdatareq(struct lwp *l, u_long c
}
}
-MODULE_SET_HOOK(uipc_syscalls_50_hook, "uipc50", compat_ifdatareq);
-MODULE_UNSET_HOOK(uipc_syscalls_50_hook);
-
void
uipc_syscalls_50_init(void)
{
- uipc_syscalls_50_hook_set();
+ MODULE_SET_HOOK(uipc_syscalls_50_hook, "uipc50", compat_ifdatareq);
}
void
uipc_syscalls_50_fini(void)
{
- uipc_syscalls_50_hook_unset();
+ MODULE_UNSET_HOOK(uipc_syscalls_50_hook);
}
Index: src/sys/compat/common/uipc_usrreq_70.c
diff -u src/sys/compat/common/uipc_usrreq_70.c:1.1.20.5 src/sys/compat/common/uipc_usrreq_70.c:1.1.20.6
--- src/sys/compat/common/uipc_usrreq_70.c:1.1.20.5 Fri Jan 18 00:01:01 2019
+++ src/sys/compat/common/uipc_usrreq_70.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.6 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.6 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -73,19 +73,17 @@ compat_70_unp_addsockcred(struct lwp *l,
return m_add(control, m);
}
-MODULE_SET_HOOK(compat_70_unp_hook, "unp_70", compat_70_unp_addsockcred);
-MODULE_UNSET_HOOK(compat_70_unp_hook);
-
void
uipc_usrreq_70_init(void)
{
- compat_70_unp_hook_set();
+ MODULE_SET_HOOK(compat_70_unp_hook, "unp_70",
+ compat_70_unp_addsockcred);
}
void
uipc_usrreq_70_fini(void)
{
- compat_70_unp_hook_unset();
+ MODULE_UNSET_HOOK(compat_70_unp_hook);
}
Index: src/sys/compat/common/usb_subr_30.c
diff -u src/sys/compat/common/usb_subr_30.c:1.1.2.6 src/sys/compat/common/usb_subr_30.c:1.1.2.7
--- src/sys/compat/common/usb_subr_30.c:1.1.2.6 Sun Jan 13 10:49:49 2019
+++ src/sys/compat/common/usb_subr_30.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr_30.c,v 1.1.2.6 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: usb_subr_30.c,v 1.1.2.7 2019/01/23 03:34:14 pgoyette Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.6 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.7 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -228,23 +228,19 @@ usb_copy_to_old30(struct usb_event *ue,
return 0;
}
-MODULE_SET_HOOK(usb_subr_30_fill_hook, "usb_30", usbd_fill_deviceinfo_old);
-MODULE_SET_HOOK(usb_subr_30_copy_hook, "usb_30", usb_copy_to_old30);
-MODULE_UNSET_HOOK(usb_subr_30_fill_hook);
-MODULE_UNSET_HOOK(usb_subr_30_copy_hook);
-
void
usb_30_init(void)
{
- usb_subr_30_copy_hook_set();
- usb_subr_30_fill_hook_set();
+ MODULE_SET_HOOK(usb_subr_30_fill_hook, "usb_30",
+ usbd_fill_deviceinfo_old);
+ MODULE_SET_HOOK(usb_subr_30_copy_hook, "usb_30", usb_copy_to_old30);
}
void
usb_30_fini(void)
{
- usb_subr_30_fill_hook_unset();
- usb_subr_30_copy_hook_unset();
+ MODULE_UNSET_HOOK(usb_subr_30_fill_hook);
+ MODULE_UNSET_HOOK(usb_subr_30_copy_hook);
}
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.15 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.16
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.15 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.15 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.16 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.15 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.16 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1032,9 +1032,6 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE_SET_HOOK(rnd_ioctl_50_32_hook, "rnd32_50", compat32_50_rnd_ioctl);
-MODULE_UNSET_HOOK(rnd_ioctl_50_32_hook);
-
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50, "compat_netbsd32_60,compat_50");
static int
@@ -1047,14 +1044,15 @@ compat_netbsd32_50_modcmd(modcmd_t cmd,
ret = syscall_establish(&emul_netbsd32,
compat_netbsd32_50_syscalls);
if (ret == 0)
- rnd_ioctl_50_32_hook_set();
+ MODULE_SET_HOOK(rnd_ioctl_50_32_hook, "rnd32_50",
+ compat32_50_rnd_ioctl);
return ret;
case MODULE_CMD_FINI:
ret = syscall_disestablish(&emul_netbsd32,
compat_netbsd32_50_syscalls);
if (ret == 0)
- rnd_ioctl_50_32_hook_unset();
+ MODULE_UNSET_HOOK(rnd_ioctl_50_32_hook);
return ret;
default:
Index: src/sys/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.5 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.6
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.5 Tue Sep 18 23:03:54 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.5 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.5 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -175,9 +175,6 @@ netbsd32_80_modctl(struct lwp *lwp, cons
return error;
}
-MODULE_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80", netbsd32_80_modctl);
-MODULE_UNSET_HOOK(compat32_80_modctl_hook);
-
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32,compat_80");
static int
@@ -186,11 +183,12 @@ compat_netbsd32_80_modcmd(modcmd_t cmd,
switch (cmd) {
case MODULE_CMD_INIT:
- compat32_80_modctl_hook_set();
+ MODULE_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80",
+ netbsd32_80_modctl);
return 0;
case MODULE_CMD_FINI:
- compat32_80_modctl_hook_unset();
+ MODULE_UNSET_HOOK(compat32_80_modctl_hook);
return 0;
default:
Index: src/sys/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.7 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.8
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.7 Tue Jan 22 07:42:40 2019
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.7 2019/01/22 07:42:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.8 2019/01/23 03:34: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: netbsd32_kern_proc.c,v 1.1.2.7 2019/01/22 07:42:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.8 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -134,20 +134,14 @@ get_base32(char **argv, size_t i)
return (vaddr_t)NETBSD32PTR64(argv32[i]);
}
-#if !defined(_RUMPSERVER)
-MODULE_SET_HOOK(kern_proc_32_copyin_hook, "kern_proc_32", copyin_psstrings_32);
-MODULE_SET_HOOK(kern_proc_32_base_hook, "kern_proc_32", get_base32);
-MODULE_UNSET_HOOK(kern_proc_32_copyin_hook);
-MODULE_UNSET_HOOK(kern_proc_32_base_hook);
-#endif
-
void
netbsd32_kern_proc_32_init(void)
{
#if !defined(_RUMPSERVER)
- kern_proc_32_copyin_hook_set();
- kern_proc_32_base_hook_set();
+ MODULE_SET_HOOK(kern_proc_32_copyin_hook, "kern_proc_32",
+ copyin_psstrings_32);
+ MODULE_SET_HOOK(kern_proc_32_base_hook, "kern_proc_32", get_base32);
#endif
}
@@ -156,7 +150,7 @@ netbsd32_kern_proc_32_fini(void)
{
#if !defined(_RUMPSERVER)
- kern_proc_32_copyin_hook_unset();
- kern_proc_32_base_hook_unset();
+ MODULE_UNSET_HOOK(kern_proc_32_copyin_hook);
+ MODULE_UNSET_HOOK(kern_proc_32_base_hook);
#endif
}
Index: src/sys/compat/sunos/sunos_mod.c
diff -u src/sys/compat/sunos/sunos_mod.c:1.3.28.2 src/sys/compat/sunos/sunos_mod.c:1.3.28.3
--- src/sys/compat/sunos/sunos_mod.c:1.3.28.2 Thu Oct 18 22:09:56 2018
+++ src/sys/compat/sunos/sunos_mod.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $ */
+/* $NetBSD: sunos_mod.c,v 1.3.28.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,v 1.3.28.3 2019/01/23 03:34:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -68,20 +68,18 @@ get_sunos_emul(const struct emul **e)
return 0;
}
-MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul", get_sunos_emul);
-MODULE_UNSET_HOOK(get_emul_sunos_hook);
-
static int
compat_sunos_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
case MODULE_CMD_INIT:
- get_emul_sunos_hook_set();
+ MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul",
+ get_sunos_emul);
return exec_add(&sunos_execsw, 1);
case MODULE_CMD_FINI:
- get_emul_sunos_hook_unset();
+ MODULE_UNSET_HOOK(get_emul_sunos_hook);
return exec_remove(&sunos_execsw, 1);
default:
Index: src/sys/compat/sunos32/sunos32_mod.c
diff -u src/sys/compat/sunos32/sunos32_mod.c:1.3.28.2 src/sys/compat/sunos32/sunos32_mod.c:1.3.28.3
--- src/sys/compat/sunos32/sunos32_mod.c:1.3.28.2 Thu Oct 18 22:09:56 2018
+++ src/sys/compat/sunos32/sunos32_mod.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $ */
+/* $NetBSD: sunos32_mod.c,v 1.3.28.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_mod.c,v 1.3.28.3 2019/01/23 03:34:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -70,9 +70,6 @@ get_sunos_emul(const struct emul **e)
*e = &emul_sunos;
return 0;
}
-
-MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul", get_sunos_emul);
-MODULE_UNSET_HOOK(get_emul_sunos_hook);
static int
compat_sunos_modcmd(modcmd_t cmd, void *arg)
@@ -80,11 +77,12 @@ compat_sunos_modcmd(modcmd_t cmd, void *
switch (cmd) {
case MODULE_CMD_INIT:
- get_emul_sunos_hook_set();
+ MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul",
+ get_sunos_emul);
return exec_add(&sunos_execsw, 1);
case MODULE_CMD_FINI:
- get_emul_sunos_hook_unset();
+ MODULE_UNSET_HOOK(get_emul_sunos_hook);
return exec_remove(&sunos_execsw, 1);
default:
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.6 src/sys/dev/raidframe/rf_compat50.c:1.3.2.7
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.6 Sun Sep 23 03:44:04 2018
+++ src/sys/dev/raidframe/rf_compat50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.6 2018/09/23 03:44:04 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.7 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -240,21 +240,18 @@ raidframe_ioctl_50(int cmd, int initted,
return EPASSTHROUGH;
}
-MODULE_SET_HOOK(raidframe50_ioctl_hook, "raid50", raidframe_ioctl_50);
-MODULE_UNSET_HOOK(raidframe50_ioctl_hook)
-
void
raidframe_50_init(void)
{
- raidframe50_ioctl_hook_set();
+ MODULE_SET_HOOK(raidframe50_ioctl_hook, "raid50", raidframe_ioctl_50);
}
void
raidframe_50_fini(void)
{
- raidframe50_ioctl_hook_unset();
+ MODULE_UNSET_HOOK(raidframe50_ioctl_hook)
}
MODULE(MODULE_CLASS_EXEC, raid_50, "raid,compat_50");
Index: src/sys/dev/raidframe/rf_compat80.c
diff -u src/sys/dev/raidframe/rf_compat80.c:1.2.2.4 src/sys/dev/raidframe/rf_compat80.c:1.2.2.5
--- src/sys/dev/raidframe/rf_compat80.c:1.2.2.4 Tue Sep 18 23:03:54 2018
+++ src/sys/dev/raidframe/rf_compat80.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.c,v 1.2.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: rf_compat80.c,v 1.2.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -264,20 +264,16 @@ int error;
return EPASSTHROUGH;
}
-MODULE_SET_HOOK(raidframe80_ioctl_hook, "raid80", raidframe_ioctl_80);
-MODULE_UNSET_HOOK(raidframe80_ioctl_hook)
-
void
raidframe_80_init(void)
{
- raidframe80_ioctl_hook_set();
+ MODULE_SET_HOOK(raidframe80_ioctl_hook, "raid80", raidframe_ioctl_80);
}
void
raidframe_80_fini(void)
{
- raidframe80_ioctl_hook_unset();
+ MODULE_UNSET_HOOK(raidframe80_ioctl_hook)
}
-
Index: src/sys/dev/wscons/wsevent_50.c
diff -u src/sys/dev/wscons/wsevent_50.c:1.1.2.5 src/sys/dev/wscons/wsevent_50.c:1.1.2.6
--- src/sys/dev/wscons/wsevent_50.c:1.1.2.5 Tue Sep 18 23:03:55 2018
+++ src/sys/dev/wscons/wsevent_50.c Wed Jan 23 03:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent_50.c,v 1.1.2.5 2018/09/18 23:03:55 pgoyette Exp $ */
+/* $NetBSD: wsevent_50.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.1.2.5 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -144,20 +144,17 @@ wsevent_copyout_events50(const struct ws
return 0;
}
-MODULE_SET_HOOK(wsevent_50_copyout_events_hook, "wsc_50",
- wsevent_copyout_events50);
-MODULE_UNSET_HOOK(wsevent_50_copyout_events_hook);
-
void
wsevent_50_init(void)
{
- wsevent_50_copyout_events_hook_set();
+ MODULE_SET_HOOK(wsevent_50_copyout_events_hook, "wsc_50",
+ wsevent_copyout_events50);
}
void
wsevent_50_fini(void)
{
- wsevent_50_copyout_events_hook_unset();
+ MODULE_UNSET_HOOK(wsevent_50_copyout_events_hook);
}
Index: src/sys/fs/puffs/puffs_compat.c
diff -u src/sys/fs/puffs/puffs_compat.c:1.4.16.5 src/sys/fs/puffs/puffs_compat.c:1.4.16.6
--- src/sys/fs/puffs/puffs_compat.c:1.4.16.5 Mon Jan 14 13:34:28 2019
+++ src/sys/fs/puffs/puffs_compat.c Wed Jan 23 03:34:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_compat.c,v 1.4.16.5 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: puffs_compat.c,v 1.4.16.6 2019/01/23 03:34:15 pgoyette Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.4.16.5 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.4.16.6 2019/01/23 03:34:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -436,21 +436,16 @@ puffs_compat_incoming(struct puffs_req *
}
}
-MODULE_SET_HOOK(puffs_50_out_hook, "pffs50", puffs_compat_outgoing);
-MODULE_SET_HOOK(puffs_50_in_hook, "pffs50", puffs_compat_incoming);
-MODULE_UNSET_HOOK(puffs_50_out_hook);
-MODULE_UNSET_HOOK(puffs_50_in_hook);
-
void puffs_50_init(void)
{
- puffs_50_out_hook_set();
- puffs_50_in_hook_set();
+ MODULE_SET_HOOK(puffs_50_out_hook, "pffs50", puffs_compat_outgoing);
+ MODULE_SET_HOOK(puffs_50_in_hook, "pffs50", puffs_compat_incoming);
}
void puffs_50_fini(void)
{
- puffs_50_out_hook_unset();
- puffs_50_in_hook_unset();
+ MODULE_UNSET_HOOK(puffs_50_out_hook);
+ MODULE_UNSET_HOOK(puffs_50_in_hook);
}
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.7 src/sys/opencrypto/ocryptodev.c:1.11.2.8
--- src/sys/opencrypto/ocryptodev.c:1.11.2.7 Sun Sep 23 03:44:04 2018
+++ src/sys/opencrypto/ocryptodev.c Wed Jan 23 03:34:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.11.2.8 2019/01/23 03:34: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 $ */
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.8 2019/01/23 03:34:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -287,21 +287,18 @@ ocryptodev_msession(struct fcrypt *fcr,
return 0;
}
-MODULE_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
-MODULE_UNSET_HOOK(ocryptof_50_hook);
-
static void
crypto_50_init(void)
{
- ocryptof_50_hook_set();
+ MODULE_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
}
static void
crypto_50_fini(void)
{
- ocryptof_50_hook_unset();
+ MODULE_UNSET_HOOK(ocryptof_50_hook);
}
MODULE(MODULE_CLASS_EXEC, compat_crypto_50, "crypto,compat_50");
Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.14 src/sys/sys/module_hook.h:1.1.2.15
--- src/sys/sys/module_hook.h:1.1.2.14 Tue Jan 22 07:42:42 2019
+++ src/sys/sys/module_hook.h Wed Jan 23 03:34:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.14 2019/01/22 07:42:42 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.15 2019/01/23 03:34:15 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -56,9 +56,7 @@ extern struct hook ## _t { \
} hook __cacheline_aligned;
#define MODULE_SET_HOOK(hook, waitchan, func) \
-static void hook ## _set(void); \
-static void hook ## _set(void) \
-{ \
+do { \
\
KASSERT(!hook.hooked); \
\
@@ -73,12 +71,10 @@ static void hook ## _set(void) \
\
/* Let them use it */ \
hook.hooked = true; \
-}
+} while /* CONSTCOND */ (0)
#define MODULE_UNSET_HOOK(hook) \
-static void (hook ## _unset)(void); \
-static void (hook ## _unset)(void) \
-{ \
+do { \
\
KASSERT(kernconfig_is_held()); \
KASSERT(hook.hooked); \
@@ -90,7 +86,7 @@ static void (hook ## _unset)(void) \
/* Prevent new localcount_acquire calls. */ \
hook.hooked = false; \
\
- /* Wait for existing localcount_acquire calls to drain. */ \
+ /* Wait for existing localcount_acquire calls to finish. */ \
pserialize_perform(hook.psz); \
\
/* Wait for existing localcount references to drain. */\
@@ -102,7 +98,7 @@ static void (hook ## _unset)(void) \
cv_destroy(&hook.cv); \
mutex_destroy(&hook.mtx); \
pserialize_destroy(hook.psz); \
-}
+} while /* CONSTCOND */ (0)
#define MODULE_CALL_HOOK(hook, args, default, retval) \
do { \
