Module Name: src
Committed By: pgoyette
Date: Fri Mar 1 11:06:57 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c netbsd32_machdep_16.c
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/mips/mips: netbsd32_machdep.c netbsd32_machdep_16.c
src/sys/arch/sparc/fpu: fpu.c
src/sys/arch/sparc64/sparc64: netbsd32_machdep.c netbsd32_machdep_16.c
src/sys/compat/common: 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_43.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/linux/common: linux_exec_elf32.c
src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_compat_80.c
netbsd32_exec_elf32.c netbsd32_kern_proc.c netbsd32_module.c
src/sys/compat/sunos: sunos_mod.c
src/sys/compat/sunos32: sunos32_mod.c
src/sys/dev: bio.c ccd.c clockctl.c vnd.c
src/sys/dev/raidframe: rf_compat32.c rf_compat50.c rf_compat80.c
rf_netbsdkintf.c
src/sys/dev/sysmon: sysmon_power.c
src/sys/dev/usb: ugen.c uhid.c usb.c
src/sys/dev/wscons: wsevent.c wsevent_50.c
src/sys/fs/puffs: puffs_compat.c puffs_msgif.c
src/sys/kern: kern_proc.c kern_rndq.c sys_module.c sysv_ipc.c tty.c
tty_ptm.c uipc_usrreq.c vfs_syscalls.c
src/sys/net: if.c if_spppsubr.c rtsock.c rtsock_shared.c
src/sys/net80211: ieee80211_ioctl.c
src/sys/opencrypto: cryptodev.c ocryptodev.c
src/sys/sys: module_hook.h
Log Message:
Rename the MODULE_*_HOOK() macros to MODULE_HOOK_*() as briefly
discussed on irc.
NFCI intended.
Ride the earlier kernel bump - it;s getting crowded.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.518 -r1.519 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/netbsd32_machdep_16.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/bio_30.c \
src/sys/compat/common/clockctl_50.c src/sys/compat/common/if_spppsubr50.c \
src/sys/compat/common/sysmon_power_40.c src/sys/compat/common/vnd_30.c \
src/sys/compat/common/vnd_50.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/common/ccd_60.c \
src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/compat_sysv_50_mod.c \
src/sys/compat/common/if43_20.c src/sys/compat/common/rndpseudo_50.c \
src/sys/compat/common/uipc_usrreq_70.c \
src/sys/compat/common/usb_subr_30.c \
src/sys/compat/common/vfs_syscalls_10.c
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/ieee80211_20.c \
src/sys/compat/common/kern_mod_80.c src/sys/compat/common/rtsock_70.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/common/rtsock_14.c \
src/sys/compat/common/tty_60.c src/sys/compat/common/uipc_syscalls_50.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/common/tty_43.c
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.98 -r1.99 src/sys/compat/linux/common/linux_exec_elf32.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/netbsd32/netbsd32_exec_elf32.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sunos/sunos_mod.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sunos32/sunos32_mod.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/bio.c
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/ccd.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/clockctl.c
cvs rdiff -u -r1.271 -r1.272 src/sys/dev/vnd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/raidframe/rf_compat32.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_compat80.c
cvs rdiff -u -r1.375 -r1.376 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wscons/wsevent_50.c
cvs rdiff -u -r1.6 -r1.7 src/sys/fs/puffs/puffs_compat.c
cvs rdiff -u -r1.103 -r1.104 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.227 -r1.228 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.28 -r1.29 src/sys/kern/sys_module.c
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/sysv_ipc.c
cvs rdiff -u -r1.280 -r1.281 src/sys/kern/tty.c
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.191 -r1.192 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.526 -r1.527 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.445 -r1.446 src/sys/net/if.c
cvs rdiff -u -r1.181 -r1.182 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.247 -r1.248 src/sys/net/rtsock.c
cvs rdiff -u -r1.3 -r1.4 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.63 -r1.64 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.99 -r1.100 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.2 -r1.3 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.118 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.119
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.118 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.2 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.3
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.2 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.518 src/sys/arch/amd64/conf/GENERIC:1.519
--- src/sys/arch/amd64/conf/GENERIC:1.518 Fri Mar 1 08:17:51 2019
+++ src/sys/arch/amd64/conf/GENERIC Fri Mar 1 11:06:55 2019
@@ -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"
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.17 src/sys/arch/mips/mips/netbsd32_machdep.c:1.18
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.17 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/arch/mips/mips/netbsd32_machdep_16.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.2 src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.3
--- src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.2 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep_16.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/arch/sparc/fpu/fpu.c
diff -u src/sys/arch/sparc/fpu/fpu.c:1.28 src/sys/arch/sparc/fpu/fpu.c:1.29
--- src/sys/arch/sparc/fpu/fpu.c:1.28 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/sparc/fpu/fpu.c Fri Mar 1 11:06:55 2019
@@ -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;
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.112 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.113
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.112 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.2 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.3
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.2 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Fri Mar 1 11:06:55 2019
@@ -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);
}
Index: src/sys/compat/common/bio_30.c
diff -u src/sys/compat/common/bio_30.c:1.2 src/sys/compat/common/bio_30.c:1.3
--- src/sys/compat/common/bio_30.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/bio_30.c Fri Mar 1 11:06:56 2019
@@ -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);
}
Index: src/sys/compat/common/clockctl_50.c
diff -u src/sys/compat/common/clockctl_50.c:1.2 src/sys/compat/common/clockctl_50.c:1.3
--- src/sys/compat/common/clockctl_50.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/clockctl_50.c Fri Mar 1 11:06:56 2019
@@ -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,7 +130,7 @@ 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);
}
@@ -138,5 +138,5 @@ void
clockctl_50_fini(void)
{
- MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
+ MODULE_HOOK_UNSET(clockctl_ioctl_50_hook);
}
Index: src/sys/compat/common/if_spppsubr50.c
diff -u src/sys/compat/common/if_spppsubr50.c:1.2 src/sys/compat/common/if_spppsubr50.c:1.3
--- src/sys/compat/common/if_spppsubr50.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/if_spppsubr50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr50.c,v 1.3 2019/03/01 11:06:56 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.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -158,12 +158,12 @@ void
if_spppsubr_50_init(void)
{
- MODULE_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
+ MODULE_HOOK_SET(sppp_params_50_hook, "sppp60", sppp_compat50_params);
}
void
if_spppsubr_50_fini(void)
{
- MODULE_UNSET_HOOK(sppp_params_50_hook);
+ MODULE_HOOK_UNSET(sppp_params_50_hook);
}
Index: src/sys/compat/common/sysmon_power_40.c
diff -u src/sys/compat/common/sysmon_power_40.c:1.2 src/sys/compat/common/sysmon_power_40.c:1.3
--- src/sys/compat/common/sysmon_power_40.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/sysmon_power_40.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power_40.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: sysmon_power_40.c,v 1.3 2019/03/01 11:06:56 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.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -96,7 +96,7 @@ void
sysmon_power_40_init(void)
{
- MODULE_SET_HOOK(compat_sysmon_power_40_hook, "smon60",
+ MODULE_HOOK_SET(compat_sysmon_power_40_hook, "smon60",
compat_40_sysmon_power);
}
@@ -104,5 +104,5 @@ void
sysmon_power_40_fini(void)
{
- MODULE_UNSET_HOOK(compat_sysmon_power_40_hook);
+ MODULE_HOOK_UNSET(compat_sysmon_power_40_hook);
}
Index: src/sys/compat/common/vnd_30.c
diff -u src/sys/compat/common/vnd_30.c:1.2 src/sys/compat/common/vnd_30.c:1.3
--- src/sys/compat/common/vnd_30.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/vnd_30.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd_30.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: vnd_30.c,v 1.3 2019/03/01 11:06:56 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.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -123,12 +123,12 @@ void
vnd_30_init(void)
{
- MODULE_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
+ MODULE_HOOK_SET(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
}
void
vnd_30_fini(void)
{
- MODULE_UNSET_HOOK(compat_vndioctl_30_hook);
+ MODULE_HOOK_UNSET(compat_vndioctl_30_hook);
}
Index: src/sys/compat/common/vnd_50.c
diff -u src/sys/compat/common/vnd_50.c:1.2 src/sys/compat/common/vnd_50.c:1.3
--- src/sys/compat/common/vnd_50.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/vnd_50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd_50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: vnd_50.c,v 1.3 2019/03/01 11:06:56 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.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_50.c,v 1.3 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -123,12 +123,12 @@ void
vnd_50_init(void)
{
- MODULE_SET_HOOK(compat_vndioctl_50_hook, "vnd_50", compat_50_vndioctl);
+ MODULE_HOOK_SET(compat_vndioctl_50_hook, "vnd_50", compat_50_vndioctl);
}
void
vnd_50_fini(void)
{
- MODULE_UNSET_HOOK(compat_vndioctl_50_hook);
+ MODULE_HOOK_UNSET(compat_vndioctl_50_hook);
}
Index: src/sys/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.9 src/sys/compat/common/ccd_60.c:1.10
--- src/sys/compat/common/ccd_60.c:1.9 Sun Jan 27 03:00:48 2019
+++ src/sys/compat/common/ccd_60.c Fri Mar 1 11:06:56 2019
@@ -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);
}
Index: src/sys/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.9 src/sys/compat/common/rtsock_50.c:1.10
--- src/sys/compat/common/rtsock_50.c:1.9 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/rtsock_50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.9 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.10 2019/03/01 11:06:56 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.9 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $");
#define COMPAT_RTSOCK /* Use the COMPATNAME/COMPATCALL macros and the
* various other compat definitions - see
@@ -153,16 +153,16 @@ void
rtsock_50_init(void)
{
- MODULE_SET_HOOK(rtsock_iflist_50_hook, "rts_50", compat_50_iflist);
- MODULE_SET_HOOK(rtsock_oifmsg_50_hook, "rts_50", compat_50_rt_oifmsg);
- MODULE_SET_HOOK(rtsock_rt_missmsg_50_hook, "rts_50",
+ MODULE_HOOK_SET(rtsock_iflist_50_hook, "rts_50", compat_50_iflist);
+ MODULE_HOOK_SET(rtsock_oifmsg_50_hook, "rts_50", compat_50_rt_oifmsg);
+ MODULE_HOOK_SET(rtsock_rt_missmsg_50_hook, "rts_50",
compat_50_rt_missmsg);
- MODULE_SET_HOOK(rtsock_rt_ifmsg_50_hook, "rts_50", compat_50_rt_ifmsg);
- MODULE_SET_HOOK(rtsock_rt_newaddrmsg_50_hook, "rts_50",
+ MODULE_HOOK_SET(rtsock_rt_ifmsg_50_hook, "rts_50", compat_50_rt_ifmsg);
+ MODULE_HOOK_SET(rtsock_rt_newaddrmsg_50_hook, "rts_50",
compat_50_rt_newaddrmsg);
- MODULE_SET_HOOK(rtsock_rt_ifannouncemsg_50_hook, "rts_50",
+ MODULE_HOOK_SET(rtsock_rt_ifannouncemsg_50_hook, "rts_50",
compat_50_rt_ifannouncemsg);
- MODULE_SET_HOOK(rtsock_rt_ieee80211msg_50_hook, "rts_50",
+ MODULE_HOOK_SET(rtsock_rt_ieee80211msg_50_hook, "rts_50",
compat_50_rt_ieee80211msg);
}
@@ -170,11 +170,11 @@ void
rtsock_50_fini(void)
{
- MODULE_UNSET_HOOK(rtsock_iflist_50_hook);
- MODULE_UNSET_HOOK(rtsock_oifmsg_50_hook);
- MODULE_UNSET_HOOK(rtsock_rt_missmsg_50_hook);
- MODULE_UNSET_HOOK(rtsock_rt_ifmsg_50_hook);
- MODULE_UNSET_HOOK(rtsock_rt_newaddrmsg_50_hook);
- MODULE_UNSET_HOOK(rtsock_rt_ifannouncemsg_50_hook);
- MODULE_UNSET_HOOK(rtsock_rt_ieee80211msg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_iflist_50_hook);
+ MODULE_HOOK_UNSET(rtsock_oifmsg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_rt_missmsg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_rt_ifmsg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_rt_newaddrmsg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_rt_ifannouncemsg_50_hook);
+ MODULE_HOOK_UNSET(rtsock_rt_ieee80211msg_50_hook);
}
Index: src/sys/compat/common/compat_sysv_50_mod.c
diff -u src/sys/compat/common/compat_sysv_50_mod.c:1.3 src/sys/compat/common/compat_sysv_50_mod.c:1.4
--- src/sys/compat/common/compat_sysv_50_mod.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/compat_sysv_50_mod.c Fri Mar 1 11:06:56 2019
@@ -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
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
if (error != 0) {
break;
}
- MODULE_UNSET_HOOK(sysvipc_sysctl_50_hook);
+ MODULE_HOOK_UNSET(sysvipc_sysctl_50_hook);
break;
default:
Index: src/sys/compat/common/if43_20.c
diff -u src/sys/compat/common/if43_20.c:1.3 src/sys/compat/common/if43_20.c:1.4
--- src/sys/compat/common/if43_20.c:1.3 Tue Jan 29 04:10:10 2019
+++ src/sys/compat/common/if43_20.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if43_20.c,v 1.3 2019/01/29 04:10:10 pgoyette Exp $ */
+/* $NetBSD: if43_20.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: if43_20.c,v 1.3 2019/01/29 04:10:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -83,12 +83,12 @@ void
if43_20_init(void)
{
- MODULE_SET_HOOK(if43_cvtcmd_20_hook, "if4320", if43_cvtcmd_20);
+ MODULE_HOOK_SET(if43_cvtcmd_20_hook, "if4320", if43_cvtcmd_20);
}
void
if43_20_fini(void)
{
- MODULE_UNSET_HOOK(if43_cvtcmd_20_hook);
+ MODULE_HOOK_UNSET(if43_cvtcmd_20_hook);
}
Index: src/sys/compat/common/rndpseudo_50.c
diff -u src/sys/compat/common/rndpseudo_50.c:1.3 src/sys/compat/common/rndpseudo_50.c:1.4
--- src/sys/compat/common/rndpseudo_50.c:1.3 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/rndpseudo_50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo_50.c,v 1.3 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: rndpseudo_50.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo_50.c,v 1.3 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo_50.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -125,12 +125,12 @@ void
rndpseudo_50_init(void)
{
- MODULE_SET_HOOK(rnd_ioctl_50_hook, "rnd_50", compat_50_rnd_ioctl);
+ MODULE_HOOK_SET(rnd_ioctl_50_hook, "rnd_50", compat_50_rnd_ioctl);
}
void
rndpseudo_50_fini(void)
{
- MODULE_UNSET_HOOK(rnd_ioctl_50_hook);
+ MODULE_HOOK_UNSET(rnd_ioctl_50_hook);
}
Index: src/sys/compat/common/uipc_usrreq_70.c
diff -u src/sys/compat/common/uipc_usrreq_70.c:1.3 src/sys/compat/common/uipc_usrreq_70.c:1.4
--- src/sys/compat/common/uipc_usrreq_70.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/uipc_usrreq_70.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq_70.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq_70.c,v 1.4 2019/03/01 11:06:56 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.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -77,7 +77,7 @@ void
uipc_usrreq_70_init(void)
{
- MODULE_SET_HOOK(uipc_unp_70_hook, "unp_70",
+ MODULE_HOOK_SET(uipc_unp_70_hook, "unp_70",
compat_70_unp_addsockcred);
}
@@ -85,5 +85,5 @@ void
uipc_usrreq_70_fini(void)
{
- MODULE_UNSET_HOOK(uipc_unp_70_hook);
+ MODULE_HOOK_UNSET(uipc_unp_70_hook);
}
Index: src/sys/compat/common/usb_subr_30.c
diff -u src/sys/compat/common/usb_subr_30.c:1.3 src/sys/compat/common/usb_subr_30.c:1.4
--- src/sys/compat/common/usb_subr_30.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/usb_subr_30.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr_30.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: usb_subr_30.c,v 1.4 2019/03/01 11:06:56 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.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -232,15 +232,15 @@ void
usb_30_init(void)
{
- MODULE_SET_HOOK(usb_subr_fill_30_hook, "usb_30",
+ MODULE_HOOK_SET(usb_subr_fill_30_hook, "usb_30",
usbd_fill_deviceinfo_old);
- MODULE_SET_HOOK(usb_subr_copy_30_hook, "usb_30", usb_copy_to_old30);
+ MODULE_HOOK_SET(usb_subr_copy_30_hook, "usb_30", usb_copy_to_old30);
}
void
usb_30_fini(void)
{
- MODULE_UNSET_HOOK(usb_subr_fill_30_hook);
- MODULE_UNSET_HOOK(usb_subr_copy_30_hook);
+ MODULE_HOOK_UNSET(usb_subr_fill_30_hook);
+ MODULE_HOOK_UNSET(usb_subr_copy_30_hook);
}
Index: src/sys/compat/common/vfs_syscalls_10.c
diff -u src/sys/compat/common/vfs_syscalls_10.c:1.3 src/sys/compat/common/vfs_syscalls_10.c:1.4
--- src/sys/compat/common/vfs_syscalls_10.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/vfs_syscalls_10.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_10.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls_10.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: vfs_syscalls_10.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_10.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -55,11 +55,11 @@ real_sys_openat_10(struct pathbuf **pb)
void vfs_syscalls_10_init(void)
{
- MODULE_SET_HOOK(vfs_openat_10_hook, "openat_10", real_sys_openat_10);
+ MODULE_HOOK_SET(vfs_openat_10_hook, "openat_10", real_sys_openat_10);
}
void vfs_syscalls_10_fini(void)
{
- MODULE_UNSET_HOOK(vfs_openat_10_hook);
+ MODULE_HOOK_UNSET(vfs_openat_10_hook);
}
Index: src/sys/compat/common/ieee80211_20.c
diff -u src/sys/compat/common/ieee80211_20.c:1.4 src/sys/compat/common/ieee80211_20.c:1.5
--- src/sys/compat/common/ieee80211_20.c:1.4 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/ieee80211_20.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_20.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: ieee80211_20.c,v 1.5 2019/03/01 11:06:56 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.4 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.5 2019/03/01 11:06:56 pgoyette Exp $");
#endif
/*
@@ -119,12 +119,12 @@ void
ieee80211_20_init(void)
{
- MODULE_SET_HOOK(ieee80211_ioctl_20_hook, "ieee20", ieee80211_20_ioctl);
+ MODULE_HOOK_SET(ieee80211_ioctl_20_hook, "ieee20", ieee80211_20_ioctl);
}
void
ieee80211_20_fini(void)
{
- MODULE_UNSET_HOOK(ieee80211_ioctl_20_hook);
+ MODULE_HOOK_UNSET(ieee80211_ioctl_20_hook);
}
Index: src/sys/compat/common/kern_mod_80.c
diff -u src/sys/compat/common/kern_mod_80.c:1.4 src/sys/compat/common/kern_mod_80.c:1.5
--- src/sys/compat/common/kern_mod_80.c:1.4 Sun Jan 27 21:25:24 2019
+++ src/sys/compat/common/kern_mod_80.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mod_80.c,v 1.4 2019/01/27 21:25:24 pgoyette Exp $ */
+/* $NetBSD: kern_mod_80.c,v 1.5 2019/03/01 11:06:56 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.4 2019/01/27 21:25:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.5 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -158,12 +158,12 @@ void
kern_mod_80_init(void)
{
- MODULE_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
+ MODULE_HOOK_SET(compat_modstat_80_hook, "mod_80",compat_80_modstat);
}
void
kern_mod_80_fini(void)
{
- MODULE_UNSET_HOOK(compat_modstat_80_hook);
+ MODULE_HOOK_UNSET(compat_modstat_80_hook);
}
Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.4 src/sys/compat/common/rtsock_70.c:1.5
--- src/sys/compat/common/rtsock_70.c:1.4 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/rtsock_70.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_70.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: rtsock_70.c,v 1.5 2019/03/01 11:06:56 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.4 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.5 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -119,15 +119,15 @@ void
rtsock_70_init(void)
{
- MODULE_SET_HOOK(rtsock_newaddr_70_hook, "rts_70",
+ MODULE_HOOK_SET(rtsock_newaddr_70_hook, "rts_70",
compat_70_rt_newaddrmsg1);
- MODULE_SET_HOOK(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
+ MODULE_HOOK_SET(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
}
void
rtsock_70_fini(void)
{
- MODULE_UNSET_HOOK(rtsock_newaddr_70_hook);
- MODULE_UNSET_HOOK(rtsock_iflist_70_hook);
+ MODULE_HOOK_UNSET(rtsock_newaddr_70_hook);
+ MODULE_HOOK_UNSET(rtsock_iflist_70_hook);
}
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.19 src/sys/compat/common/if_43.c:1.20
--- src/sys/compat/common/if_43.c:1.19 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/if_43.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.19 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.20 2019/03/01 11:06:56 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.19 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.20 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -214,7 +214,7 @@ compat_cvtcmd(u_long cmd)
default:
{ int rv;
- MODULE_CALL_HOOK(if43_cvtcmd_20_hook, (ncmd), enosys(),
+ MODULE_HOOK_CALL(if43_cvtcmd_20_hook, (ncmd), enosys(),
rv);
if (rv == 0)
return ncmd;
@@ -299,8 +299,8 @@ int
if_43_init(void)
{
- MODULE_SET_HOOK(if_cvtcmd_43_hook, "if_43", do_compat_cvtcmd);
- MODULE_SET_HOOK(if_ifioctl_43_hook, "if_43", compat_ifioctl);
+ MODULE_HOOK_SET(if_cvtcmd_43_hook, "if_43", do_compat_cvtcmd);
+ MODULE_HOOK_SET(if_ifioctl_43_hook, "if_43", compat_ifioctl);
return 0;
}
@@ -308,8 +308,8 @@ int
if_43_fini(void)
{
- MODULE_UNSET_HOOK(if_cvtcmd_43_hook);
- MODULE_UNSET_HOOK(if_ifioctl_43_hook);
+ MODULE_HOOK_UNSET(if_cvtcmd_43_hook);
+ MODULE_HOOK_UNSET(if_ifioctl_43_hook);
return 0;
}
#endif /* defined(COMPAT_43) */
Index: src/sys/compat/common/rtsock_14.c
diff -u src/sys/compat/common/rtsock_14.c:1.7 src/sys/compat/common/rtsock_14.c:1.8
--- src/sys/compat/common/rtsock_14.c:1.7 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/rtsock_14.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_14.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: rtsock_14.c,v 1.8 2019/03/01 11:06:56 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.7 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.8 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -177,14 +177,14 @@ void
rtsock_14_init(void)
{
- MODULE_SET_HOOK(rtsock_oifmsg_14_hook, "rts_14", compat_14_rt_oifmsg);
- MODULE_SET_HOOK(rtsock_iflist_14_hook, "rts_14", compat_14_iflist);
+ MODULE_HOOK_SET(rtsock_oifmsg_14_hook, "rts_14", compat_14_rt_oifmsg);
+ MODULE_HOOK_SET(rtsock_iflist_14_hook, "rts_14", compat_14_iflist);
}
void
rtsock_14_fini(void)
{
- MODULE_UNSET_HOOK(rtsock_oifmsg_14_hook);
- MODULE_UNSET_HOOK(rtsock_iflist_14_hook);
+ MODULE_HOOK_UNSET(rtsock_oifmsg_14_hook);
+ MODULE_HOOK_UNSET(rtsock_iflist_14_hook);
}
Index: src/sys/compat/common/tty_60.c
diff -u src/sys/compat/common/tty_60.c:1.7 src/sys/compat/common/tty_60.c:1.8
--- src/sys/compat/common/tty_60.c:1.7 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/tty_60.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_60.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: tty_60.c,v 1.8 2019/03/01 11:06:56 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.7 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.8 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -123,13 +123,13 @@ void
kern_tty_60_init(void)
{
- MODULE_SET_HOOK(tty_ttioctl_60_hook, "tty_60", compat_60_ttioctl);
- MODULE_SET_HOOK(tty_ptmioctl_60_hook, "tty_60", compat_60_ptmioctl);
+ MODULE_HOOK_SET(tty_ttioctl_60_hook, "tty_60", compat_60_ttioctl);
+ MODULE_HOOK_SET(tty_ptmioctl_60_hook, "tty_60", compat_60_ptmioctl);
}
void
kern_tty_60_fini(void)
{
- MODULE_UNSET_HOOK(tty_ttioctl_60_hook);
- MODULE_UNSET_HOOK(tty_ptmioctl_60_hook);
+ MODULE_HOOK_UNSET(tty_ttioctl_60_hook);
+ MODULE_HOOK_UNSET(tty_ptmioctl_60_hook);
}
Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.7 src/sys/compat/common/uipc_syscalls_50.c:1.8
--- src/sys/compat/common/uipc_syscalls_50.c:1.7 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/uipc_syscalls_50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_50.c,v 1.7 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_50.c,v 1.8 2019/03/01 11:06:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -116,12 +116,12 @@ void
uipc_syscalls_50_init(void)
{
- MODULE_SET_HOOK(uipc_syscalls_50_hook, "uipc50", compat_ifdatareq);
+ MODULE_HOOK_SET(uipc_syscalls_50_hook, "uipc50", compat_ifdatareq);
}
void
uipc_syscalls_50_fini(void)
{
- MODULE_UNSET_HOOK(uipc_syscalls_50_hook);
+ MODULE_HOOK_UNSET(uipc_syscalls_50_hook);
}
Index: src/sys/compat/common/tty_43.c
diff -u src/sys/compat/common/tty_43.c:1.33 src/sys/compat/common/tty_43.c:1.34
--- src/sys/compat/common/tty_43.c:1.33 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/common/tty_43.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: tty_43.c,v 1.34 2019/03/01 11:06:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.34 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -518,13 +518,13 @@ ttcompatsetlflags(struct tty *tp, struct
int
kern_tty_43_init(void)
{
- MODULE_SET_HOOK(tty_ttioctl_43_hook, "tty_43", compat_43_ttioctl);
+ MODULE_HOOK_SET(tty_ttioctl_43_hook, "tty_43", compat_43_ttioctl);
return 0;
}
int
kern_tty_43_fini(void)
{
- MODULE_UNSET_HOOK(tty_ttioctl_43_hook);
+ MODULE_HOOK_UNSET(tty_ttioctl_43_hook);
return 0;
}
Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.17 src/sys/compat/common/uipc_syscalls_40.c:1.18
--- src/sys/compat/common/uipc_syscalls_40.c:1.17 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/uipc_syscalls_40.c Fri Mar 1 11:06:56 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.17 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.17 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -169,12 +169,12 @@ void
uipc_syscalls_40_init(void)
{
- MODULE_SET_HOOK(uipc_syscalls_40_hook, "uipc40", compat_ifconf);
+ MODULE_HOOK_SET(uipc_syscalls_40_hook, "uipc40", compat_ifconf);
}
void
uipc_syscalls_40_fini(void)
{
- MODULE_UNSET_HOOK(uipc_syscalls_40_hook);
+ MODULE_HOOK_UNSET(uipc_syscalls_40_hook);
}
Index: src/sys/compat/linux/common/linux_exec_elf32.c
diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.98 src/sys/compat/linux/common/linux_exec_elf32.c:1.99
--- src/sys/compat/linux/common/linux_exec_elf32.c:1.98 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/linux/common/linux_exec_elf32.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_elf32.c,v 1.98 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: linux_exec_elf32.c,v 1.99 2019/03/01 11:06:56 pgoyette Exp $ */
/*-
* Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.98 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.99 2019/03/01 11:06:56 pgoyette Exp $");
#ifndef ELFSIZE
/* XXX should die */
@@ -336,7 +336,7 @@ ELFNAME2(linux,go_rt0_signature)(struct
#if (ELFSIZE == 32)
extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook;
- MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m);
+ MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m);
#else
m = machine;
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.35 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.36
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.35 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.35 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 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.35 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1044,7 +1044,7 @@ compat_netbsd32_50_modcmd(modcmd_t cmd,
ret = syscall_establish(&emul_netbsd32,
compat_netbsd32_50_syscalls);
if (ret == 0)
- MODULE_SET_HOOK(rnd_ioctl32_50_hook, "rnd32_50",
+ MODULE_HOOK_SET(rnd_ioctl32_50_hook, "rnd32_50",
compat32_50_rnd_ioctl);
return ret;
@@ -1052,7 +1052,7 @@ compat_netbsd32_50_modcmd(modcmd_t cmd,
ret = syscall_disestablish(&emul_netbsd32,
compat_netbsd32_50_syscalls);
if (ret == 0)
- MODULE_UNSET_HOOK(rnd_ioctl32_50_hook);
+ MODULE_HOOK_UNSET(rnd_ioctl32_50_hook);
return ret;
default:
Index: src/sys/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.4 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.5
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.4 Wed Jan 30 02:00:02 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.4 2019/01/30 02:00:02 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.5 2019/03/01 11:06:56 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.4 2019/01/30 02:00:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.5 2019/03/01 11:06:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -183,12 +183,12 @@ compat_netbsd32_80_modcmd(modcmd_t cmd,
switch (cmd) {
case MODULE_CMD_INIT:
- MODULE_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80",
+ MODULE_HOOK_SET(compat32_80_modctl_hook, "nb32_modctl_80",
netbsd32_80_modctl);
return 0;
case MODULE_CMD_FINI:
- MODULE_UNSET_HOOK(compat32_80_modctl_hook);
+ MODULE_HOOK_UNSET(compat32_80_modctl_hook);
return 0;
default:
Index: src/sys/compat/netbsd32/netbsd32_exec_elf32.c
diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.42 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.43
--- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.42 Tue Feb 26 06:28:43 2019
+++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec_elf32.c,v 1.42 2019/02/26 06:28:43 rin Exp $ */
+/* $NetBSD: netbsd32_exec_elf32.c,v 1.43 2019/03/01 11:06:56 pgoyette Exp $ */
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
/*
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.42 2019/02/26 06:28:43 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.43 2019/03/01 11:06:56 pgoyette Exp $");
#define ELFSIZE 32
@@ -112,7 +112,7 @@ ELFNAME2(netbsd32,probe_noteless)(struct
const char *m;
if (itp && epp->ep_interp == NULL) {
- MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m);
+ MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m);
(void)compat_elf_check_interp(epp, itp, m);
}
#ifdef _LP64
Index: src/sys/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.3 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.4
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.4 2019/03/01 11:06:56 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.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.4 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -139,9 +139,9 @@ netbsd32_kern_proc_32_init(void)
{
#if !defined(_RUMPSERVER)
- MODULE_SET_HOOK(kern_proc32_copyin_hook, "kern_proc_32",
+ MODULE_HOOK_SET(kern_proc32_copyin_hook, "kern_proc_32",
copyin_psstrings_32);
- MODULE_SET_HOOK(kern_proc32_base_hook, "kern_proc_32", get_base32);
+ MODULE_HOOK_SET(kern_proc32_base_hook, "kern_proc_32", get_base32);
#endif
}
@@ -150,7 +150,7 @@ netbsd32_kern_proc_32_fini(void)
{
#if !defined(_RUMPSERVER)
- MODULE_UNSET_HOOK(kern_proc32_copyin_hook);
- MODULE_UNSET_HOOK(kern_proc32_base_hook);
+ MODULE_HOOK_UNSET(kern_proc32_copyin_hook);
+ MODULE_HOOK_UNSET(kern_proc32_base_hook);
#endif
}
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.9 src/sys/compat/netbsd32/netbsd32_module.c:1.10
--- src/sys/compat/netbsd32/netbsd32_module.c:1.9 Thu Jan 31 16:03:50 2019
+++ src/sys/compat/netbsd32/netbsd32_module.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.9 2019/01/31 16:03:50 christos Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.10 2019/03/01 11:06:56 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.9 2019/01/31 16:03:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -216,7 +216,7 @@ netbsd32_modctl(struct lwp *lwp, const s
arg = SCARG_P32(uap, arg);
- MODULE_CALL_HOOK(compat32_80_modctl_hook, (lwp, uap, result),
+ MODULE_HOOK_CALL(compat32_80_modctl_hook, (lwp, uap, result),
enosys(), error);
if (error != EPASSTHROUGH && error != ENOSYS)
return error;
Index: src/sys/compat/sunos/sunos_mod.c
diff -u src/sys/compat/sunos/sunos_mod.c:1.5 src/sys/compat/sunos/sunos_mod.c:1.6
--- src/sys/compat/sunos/sunos_mod.c:1.5 Tue Feb 5 00:32:18 2019
+++ src/sys/compat/sunos/sunos_mod.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_mod.c,v 1.5 2019/02/05 00:32:18 pgoyette Exp $ */
+/* $NetBSD: sunos_mod.c,v 1.6 2019/03/01 11:06:56 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.5 2019/02/05 00:32:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,v 1.6 2019/03/01 11:06:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -74,12 +74,12 @@ compat_sunos_modcmd(modcmd_t cmd, void *
switch (cmd) {
case MODULE_CMD_INIT:
- MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul",
+ MODULE_HOOK_SET(get_emul_sunos_hook, "sun_emul",
get_sunos_emul);
return exec_add(&sunos_execsw, 1);
case MODULE_CMD_FINI:
- MODULE_UNSET_HOOK(get_emul_sunos_hook);
+ MODULE_HOOK_UNSET(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.5 src/sys/compat/sunos32/sunos32_mod.c:1.6
--- src/sys/compat/sunos32/sunos32_mod.c:1.5 Tue Feb 5 00:32:18 2019
+++ src/sys/compat/sunos32/sunos32_mod.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_mod.c,v 1.5 2019/02/05 00:32:18 pgoyette Exp $ */
+/* $NetBSD: sunos32_mod.c,v 1.6 2019/03/01 11:06:56 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.5 2019/02/05 00:32:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_mod.c,v 1.6 2019/03/01 11:06:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -77,12 +77,12 @@ compat_sunos_modcmd(modcmd_t cmd, void *
switch (cmd) {
case MODULE_CMD_INIT:
- MODULE_SET_HOOK(get_emul_sunos_hook, "sun_emul",
+ MODULE_HOOK_SET(get_emul_sunos_hook, "sun_emul",
get_sunos_emul);
return exec_add(&sunos_execsw, 1);
case MODULE_CMD_FINI:
- MODULE_UNSET_HOOK(get_emul_sunos_hook);
+ MODULE_HOOK_UNSET(get_emul_sunos_hook);
return exec_remove(&sunos_execsw, 1);
default:
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.14 src/sys/dev/bio.c:1.15
--- src/sys/dev/bio.c:1.14 Sun Jan 27 02:08:41 2019
+++ src/sys/dev/bio.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.14 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.15 2019/03/01 11:06:56 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.14 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.15 2019/03/01 11:06:56 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -189,7 +189,7 @@ bioioctl(dev_t dev, u_long cmd, void *ad
return ENOENT;
}
mutex_exit(&bio_lock);
- MODULE_CALL_HOOK(compat_bio_30_hook,
+ MODULE_HOOK_CALL(compat_bio_30_hook,
(common->bc_cookie, cmd, addr, bio_delegate_ioctl),
enosys(), error);
if (error == ENOSYS)
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.177 src/sys/dev/ccd.c:1.178
--- src/sys/dev/ccd.c:1.177 Sun Jan 27 02:08:41 2019
+++ src/sys/dev/ccd.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.177 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.178 2019/03/01 11:06:56 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.177 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1097,7 +1097,7 @@ ccdioctl(dev_t dev, u_long cmd, void *da
make = 1;
break;
default:
- MODULE_CALL_HOOK(ccd_ioctl_60_hook,
+ MODULE_HOOK_CALL(ccd_ioctl_60_hook,
(0, cmd, NULL, 0, NULL, NULL),
enosys(), hook);
if (hook == 0)
@@ -1111,7 +1111,7 @@ ccdioctl(dev_t dev, u_long cmd, void *da
return ENOENT;
uc = kauth_cred_get();
- MODULE_CALL_HOOK(ccd_ioctl_60_hook,
+ MODULE_HOOK_CALL(ccd_ioctl_60_hook,
(dev, cmd, data, flag, l, ccdioctl),
enosys(), error);
if (error != ENOSYS)
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.36 src/sys/dev/clockctl.c:1.37
--- src/sys/dev/clockctl.c:1.36 Sun Jan 27 02:08:41 2019
+++ src/sys/dev/clockctl.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.36 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.37 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.c,v 1.36 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.37 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -263,7 +263,7 @@ clockctlioctl(
break;
}
default:
- MODULE_CALL_HOOK(clockctl_ioctl_50_hook,
+ MODULE_HOOK_CALL(clockctl_ioctl_50_hook,
(dev, cmd, data, flags, l), enosys(), error);
if (error == ENOSYS)
error = ENOTTY;
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.271 src/sys/dev/vnd.c:1.272
--- src/sys/dev/vnd.c:1.271 Sun Jan 27 02:08:41 2019
+++ src/sys/dev/vnd.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.271 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.272 2019/03/01 11:06:56 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.271 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.272 2019/03/01 11:06:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1162,7 +1162,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
default:
/* First check for COMPAT_50 hook */
- MODULE_CALL_HOOK(compat_vndioctl_50_hook,
+ MODULE_HOOK_CALL(compat_vndioctl_50_hook,
(cmd, l, data, unit, &vattr, vndioctl_get),
enosys(), error);
@@ -1178,7 +1178,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
/* If not already handled, try the COMPAT_30 hook */
if (error == EPASSTHROUGH)
- MODULE_CALL_HOOK(compat_vndioctl_30_hook,
+ MODULE_HOOK_CALL(compat_vndioctl_30_hook,
(cmd, l, data, unit, &vattr, vndioctl_get),
enosys(), error);
Index: src/sys/dev/raidframe/rf_compat32.c
diff -u src/sys/dev/raidframe/rf_compat32.c:1.5 src/sys/dev/raidframe/rf_compat32.c:1.6
--- src/sys/dev/raidframe/rf_compat32.c:1.5 Sat Feb 9 03:33:59 2019
+++ src/sys/dev/raidframe/rf_compat32.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat32.c,v 1.5 2019/02/09 03:33:59 christos Exp $ */
+/* $NetBSD: rf_compat32.c,v 1.6 2019/03/01 11:06:56 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -166,7 +166,7 @@ static void
raidframe_netbsd32_init(void)
{
- MODULE_SET_HOOK(raidframe_netbsd32_ioctl_hook, "raid32",
+ MODULE_HOOK_SET(raidframe_netbsd32_ioctl_hook, "raid32",
raidframe_netbsd32_ioctl);
}
@@ -174,7 +174,7 @@ static void
raidframe_netbsd32_fini(void)
{
- MODULE_UNSET_HOOK(raidframe_netbsd32_ioctl_hook);
+ MODULE_HOOK_UNSET(raidframe_netbsd32_ioctl_hook);
}
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_raid, "raid,compat_netbsd32");
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.9 src/sys/dev/raidframe/rf_compat50.c:1.10
--- src/sys/dev/raidframe/rf_compat50.c:1.9 Sat Feb 9 03:33:59 2019
+++ src/sys/dev/raidframe/rf_compat50.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.9 2019/02/09 03:33:59 christos Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -240,14 +240,14 @@ static void
raidframe_50_init(void)
{
- MODULE_SET_HOOK(raidframe_ioctl_50_hook, "raid50", raidframe_ioctl_50);
+ MODULE_HOOK_SET(raidframe_ioctl_50_hook, "raid50", raidframe_ioctl_50);
}
static void
raidframe_50_fini(void)
{
- MODULE_UNSET_HOOK(raidframe_ioctl_50_hook);
+ MODULE_HOOK_UNSET(raidframe_ioctl_50_hook);
}
MODULE(MODULE_CLASS_EXEC, compat_raid_50, "raid,compat_50,compat_raid_80");
Index: src/sys/dev/raidframe/rf_compat80.c
diff -u src/sys/dev/raidframe/rf_compat80.c:1.12 src/sys/dev/raidframe/rf_compat80.c:1.13
--- src/sys/dev/raidframe/rf_compat80.c:1.12 Sat Feb 9 03:33:59 2019
+++ src/sys/dev/raidframe/rf_compat80.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.c,v 1.12 2019/02/09 03:33:59 christos Exp $ */
+/* $NetBSD: rf_compat80.c,v 1.13 2019/03/01 11:06:56 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -348,14 +348,14 @@ static void
raidframe_80_init(void)
{
- MODULE_SET_HOOK(raidframe_ioctl_80_hook, "raid80", raidframe_ioctl_80);
+ MODULE_HOOK_SET(raidframe_ioctl_80_hook, "raid80", raidframe_ioctl_80);
}
static void
raidframe_80_fini(void)
{
- MODULE_UNSET_HOOK(raidframe_ioctl_80_hook);
+ MODULE_HOOK_UNSET(raidframe_ioctl_80_hook);
}
MODULE(MODULE_CLASS_EXEC, compat_raid_80, "raid,compat_80");
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.375 src/sys/dev/raidframe/rf_netbsdkintf.c:1.376
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.375 Wed Feb 20 10:04:28 2019
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.375 2019/02/20 10:04:28 hannken Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.376 2019/03/01 11:06:56 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.375 2019/02/20 10:04:28 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.376 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_raid_autoconfig.h"
@@ -1719,20 +1719,20 @@ raidioctl(dev_t dev, u_long cmd, void *d
if ((l->l_proc->p_flag & PK_32) != 0) {
module_autoload("compat_netbsd32_raid",
MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(raidframe_netbsd32_ioctl_hook,
+ MODULE_HOOK_CALL(raidframe_netbsd32_ioctl_hook,
(rs, cmd, data), enosys(), retcode);
if (retcode != EPASSTHROUGH)
return retcode;
}
#endif
module_autoload("compat_raid_80", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(raidframe_ioctl_80_hook,
+ MODULE_HOOK_CALL(raidframe_ioctl_80_hook,
(rs, cmd, data), enosys(), retcode);
if (retcode != EPASSTHROUGH)
return retcode;
module_autoload("compat_raid_50", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(raidframe_ioctl_50_hook,
+ MODULE_HOOK_CALL(raidframe_ioctl_50_hook,
(rs, cmd, data), enosys(), retcode);
if (retcode != EPASSTHROUGH)
return retcode;
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.59 src/sys/dev/sysmon/sysmon_power.c:1.60
--- src/sys/dev/sysmon/sysmon_power.c:1.59 Sun Jan 27 02:08:42 2019
+++ src/sys/dev/sysmon/sysmon_power.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.59 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.60 2019/03/01 11:06:56 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.59 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.60 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -346,7 +346,7 @@ sysmon_power_daemon_task(struct power_ev
pev.pev_type = POWER_EVENT_SWITCH_STATE_CHANGE;
- MODULE_CALL_VOID_HOOK(compat_sysmon_power_40_hook,
+ MODULE_HOOK_CALL_VOID(compat_sysmon_power_40_hook,
(&pev, pswitch, event), __nothing);
error = sysmon_power_make_dictionary(ped->dict,
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.144 src/sys/dev/usb/ugen.c:1.145
--- src/sys/dev/usb/ugen.c:1.144 Thu Feb 7 13:20:41 2019
+++ src/sys/dev/usb/ugen.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.144 2019/02/07 13:20:41 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.145 2019/03/01 11:06:56 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.144 2019/02/07 13:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.145 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1840,7 +1840,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int
case USB_GET_DEVICEINFO_OLD:
{
int ret;
- MODULE_CALL_HOOK(usb_subr_fill_30_hook,
+ MODULE_HOOK_CALL(usb_subr_fill_30_hook,
(sc->sc_udev, (struct usb_device_info_old *)addr, 0,
usbd_devinfo_vp, usbd_printBCD),
enosys(), ret);
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.105 src/sys/dev/usb/uhid.c:1.106
--- src/sys/dev/usb/uhid.c:1.105 Thu Feb 7 13:20:41 2019
+++ src/sys/dev/usb/uhid.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.105 2019/02/07 13:20:41 skrll Exp $ */
+/* $NetBSD: uhid.c,v 1.106 2019/03/01 11:06:56 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.105 2019/02/07 13:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.106 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -654,7 +654,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
(struct usb_device_info *)addr, 0);
break;
case USB_GET_DEVICEINFO_OLD:
- MODULE_CALL_HOOK(usb_subr_fill_30_hook,
+ MODULE_HOOK_CALL(usb_subr_fill_30_hook,
(sc->sc_hdev.sc_parent->sc_udev,
(struct usb_device_info_old *)addr, 0,
usbd_devinfo_vp, usbd_printBCD),
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.177 src/sys/dev/usb/usb.c:1.178
--- src/sys/dev/usb/usb.c:1.177 Sun Feb 3 03:19:28 2019
+++ src/sys/dev/usb/usb.c Fri Mar 1 11:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.177 2019/02/03 03:19:28 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.178 2019/03/01 11:06:56 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.177 2019/02/03 03:19:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -696,7 +696,7 @@ usbread(dev_t dev, struct uio *uio, int
mutex_exit(&usb_event_lock);
if (!error) {
if (useold) { /* copy fields to old struct */
- MODULE_CALL_HOOK(usb_subr_copy_30_hook,
+ MODULE_HOOK_CALL(usb_subr_copy_30_hook,
(ue, ueo, uio), enosys(), error);
if (error == ENOSYS)
error = EINVAL;
@@ -877,7 +877,7 @@ usbioctl(dev_t devt, u_long cmd, void *d
error = ENXIO;
goto fail;
}
- MODULE_CALL_HOOK(usb_subr_fill_30_hook,
+ MODULE_HOOK_CALL(usb_subr_fill_30_hook,
(dev, di, 1, usbd_devinfo_vp, usbd_printBCD),
enosys(), error);
if (error == ENOSYS)
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.41 src/sys/dev/wscons/wsevent.c:1.42
--- src/sys/dev/wscons/wsevent.c:1.41 Tue Jan 29 09:28:50 2019
+++ src/sys/dev/wscons/wsevent.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.41 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.42 2019/03/01 11:06:57 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.41 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.42 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -197,7 +197,7 @@ wsevent_copyout_events(const struct wsco
switch (ver) {
case 0:
- MODULE_CALL_HOOK(wscons_copyout_events_50_hook,
+ MODULE_HOOK_CALL(wscons_copyout_events_50_hook,
(events, cnt, uio), enosys(), error);
if (error == ENOSYS)
error = EINVAL;
Index: src/sys/dev/wscons/wsevent_50.c
diff -u src/sys/dev/wscons/wsevent_50.c:1.3 src/sys/dev/wscons/wsevent_50.c:1.4
--- src/sys/dev/wscons/wsevent_50.c:1.3 Tue Jan 29 09:28:50 2019
+++ src/sys/dev/wscons/wsevent_50.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent_50.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: wsevent_50.c,v 1.4 2019/03/01 11:06:57 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.3 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.4 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -148,7 +148,7 @@ void
wsevent_50_init(void)
{
- MODULE_SET_HOOK(wscons_copyout_events_50_hook, "wsc_50",
+ MODULE_HOOK_SET(wscons_copyout_events_50_hook, "wsc_50",
wsevent_copyout_events50);
}
@@ -156,5 +156,5 @@ void
wsevent_50_fini(void)
{
- MODULE_UNSET_HOOK(wscons_copyout_events_50_hook);
+ MODULE_HOOK_UNSET(wscons_copyout_events_50_hook);
}
Index: src/sys/fs/puffs/puffs_compat.c
diff -u src/sys/fs/puffs/puffs_compat.c:1.6 src/sys/fs/puffs/puffs_compat.c:1.7
--- src/sys/fs/puffs/puffs_compat.c:1.6 Tue Jan 29 09:28:50 2019
+++ src/sys/fs/puffs/puffs_compat.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_compat.c,v 1.6 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: puffs_compat.c,v 1.7 2019/03/01 11:06:57 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.6 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.7 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -439,13 +439,13 @@ puffs_compat_incoming(struct puffs_req *
void puffs_50_init(void)
{
- MODULE_SET_HOOK(puffs_out_50_hook, "pffs50", puffs_compat_outgoing);
- MODULE_SET_HOOK(puffs_in_50_hook, "pffs50", puffs_compat_incoming);
+ MODULE_HOOK_SET(puffs_out_50_hook, "pffs50", puffs_compat_outgoing);
+ MODULE_HOOK_SET(puffs_in_50_hook, "pffs50", puffs_compat_incoming);
}
void puffs_50_fini(void)
{
- MODULE_UNSET_HOOK(puffs_out_50_hook);
- MODULE_UNSET_HOOK(puffs_in_50_hook);
+ MODULE_HOOK_UNSET(puffs_out_50_hook);
+ MODULE_HOOK_UNSET(puffs_in_50_hook);
}
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.103 src/sys/fs/puffs/puffs_msgif.c:1.104
--- src/sys/fs/puffs/puffs_msgif.c:1.103 Tue Jan 29 09:28:50 2019
+++ src/sys/fs/puffs/puffs_msgif.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.103 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.104 2019/03/01 11:06:57 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.103 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.104 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -353,7 +353,7 @@ puffs_msg_enqueue(struct puffs_mount *pm
#if 1
/* check if we do compat adjustments */
if (pmp->pmp_docompat) {
- MODULE_CALL_HOOK(puffs_out_50_hook, (preq, &creq, &delta),
+ MODULE_HOOK_CALL(puffs_out_50_hook, (preq, &creq, &delta),
enosys(), ret);
if (ret == 0) {
park->park_creq = park->park_preq;
@@ -813,7 +813,7 @@ puffsop_msg(void *ctx, struct puffs_req
size_t csize;
KASSERT(pmp->pmp_docompat);
- MODULE_CALL_VOID_HOOK(puffs_in_50_hook,
+ MODULE_HOOK_CALL_VOID(puffs_in_50_hook,
(preq, park->park_creq), __nothing);
creq = park->park_creq;
csize = park->park_creqlen;
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.227 src/sys/kern/kern_proc.c:1.228
--- src/sys/kern/kern_proc.c:1.227 Fri Mar 1 03:20:50 2019
+++ src/sys/kern/kern_proc.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.227 2019/03/01 03:20:50 christos Exp $ */
+/* $NetBSD: kern_proc.c,v 1.228 2019/03/01 11:06:57 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.227 2019/03/01 03:20:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.228 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1899,7 +1899,7 @@ copyin_psstrings(struct proc *p, struct
int retval;
if (p->p_flag & PK_32) {
- MODULE_CALL_HOOK(kern_proc32_copyin_hook, (p, arginfo),
+ MODULE_HOOK_CALL(kern_proc32_copyin_hook, (p, arginfo),
enosys(), retval);
return retval;
}
@@ -2115,7 +2115,7 @@ copy_procargs(struct proc *p, int oid, s
#if !defined(_RUMPKERNEL)
if (p->p_flag & PK_32)
- MODULE_CALL_HOOK(kern_proc32_base_hook,
+ MODULE_HOOK_CALL(kern_proc32_base_hook,
(argv, i++), 0, base);
else
#endif /* !defined(_RUMPKERNEL) */
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.92 src/sys/kern/kern_rndq.c:1.93
--- src/sys/kern/kern_rndq.c:1.92 Tue Jan 29 09:28:50 2019
+++ src/sys/kern/kern_rndq.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.92 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.93 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.92 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.93 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1492,11 +1492,11 @@ rnd_system_ioctl(struct file *fp, u_long
break;
default:
- MODULE_CALL_HOOK(rnd_ioctl_50_hook, (fp, cmd, addr),
+ MODULE_HOOK_CALL(rnd_ioctl_50_hook, (fp, cmd, addr),
enosys(), ret);
#if defined(_LP64)
if (ret == ENOSYS)
- MODULE_CALL_HOOK(rnd_ioctl32_50_hook, (fp, cmd, addr),
+ MODULE_HOOK_CALL(rnd_ioctl32_50_hook, (fp, cmd, addr),
enosys(), ret);
#endif
if (ret == ENOSYS)
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.28 src/sys/kern/sys_module.c:1.29
--- src/sys/kern/sys_module.c:1.28 Mon Jan 28 16:55:57 2019
+++ src/sys/kern/sys_module.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.28 2019/01/28 16:55:57 christos Exp $ */
+/* $NetBSD: sys_module.c,v 1.29 2019/03/01 11:06:57 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.28 2019/01/28 16:55:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.29 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -323,7 +323,7 @@ sys_modctl(struct lwp *l, const struct s
default:
(void)module_autoload("compat_80", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(compat_modstat_80_hook,
+ MODULE_HOOK_CALL(compat_modstat_80_hook,
(SCARG(uap, cmd), &iov, arg), enosys(), error);
if (error == ENOSYS)
error = EINVAL;
Index: src/sys/kern/sysv_ipc.c
diff -u src/sys/kern/sysv_ipc.c:1.36 src/sys/kern/sysv_ipc.c:1.37
--- src/sys/kern/sysv_ipc.c:1.36 Tue Jan 29 09:28:50 2019
+++ src/sys/kern/sysv_ipc.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_ipc.c,v 1.36 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: sysv_ipc.c,v 1.37 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.36 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.37 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -375,7 +375,7 @@ sysctl_kern_sysvipc(SYSCTLFN_ARGS)
* to the non-compat sysctl code.
*/
- MODULE_CALL_HOOK(sysvipc_sysctl_50_hook, (SYSCTLFN_CALL(rnode)),
+ MODULE_HOOK_CALL(sysvipc_sysctl_50_hook, (SYSCTLFN_CALL(rnode)),
stub_sysvipc50_sysctl(SYSCTLFN_CALL(rnode)), error);
if (error != EPASSTHROUGH)
return error;
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.280 src/sys/kern/tty.c:1.281
--- src/sys/kern/tty.c:1.280 Tue Jan 29 09:28:50 2019
+++ src/sys/kern/tty.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.280 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: tty.c,v 1.281 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.280 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.281 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1412,14 +1412,14 @@ ttioctl(struct tty *tp, u_long cmd, void
/* We may have to load the compat_60 module for this. */
(void)module_autoload("compat_60", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(tty_ttioctl_60_hook,
+ MODULE_HOOK_CALL(tty_ttioctl_60_hook,
(tp, cmd, data, flag, l), enosys(), error);
if (error != EPASSTHROUGH)
return error;
/* We may have to load the compat_43 module for this. */
(void)module_autoload("compat_43", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(tty_ttioctl_43_hook,
+ MODULE_HOOK_CALL(tty_ttioctl_43_hook,
(tp, cmd, data, flag, l), enosys(), error);
return error;
}
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.39 src/sys/kern/tty_ptm.c:1.40
--- src/sys/kern/tty_ptm.c:1.39 Tue Jan 29 09:28:50 2019
+++ src/sys/kern/tty_ptm.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.39 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.40 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.39 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.40 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -403,7 +403,7 @@ ptmioctl(dev_t dev, u_long cmd, void *da
goto bad2;
return 0;
default:
- MODULE_CALL_HOOK(tty_ptmioctl_60_hook,
+ MODULE_HOOK_CALL(tty_ptmioctl_60_hook,
(dev, cmd, data, flag, l), EPASSTHROUGH, error);
if (error != EPASSTHROUGH)
return error;
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.191 src/sys/kern/uipc_usrreq.c:1.192
--- src/sys/kern/uipc_usrreq.c:1.191 Wed Feb 20 09:59:39 2019
+++ src/sys/kern/uipc_usrreq.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.191 2019/02/20 09:59:39 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.192 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.191 2019/02/20 09:59:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.192 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -351,7 +351,7 @@ unp_output(struct mbuf *m, struct mbuf *
if (unp->unp_conn->unp_flags & UNP_WANTCRED)
control = unp_addsockcred(curlwp, control);
if (unp->unp_conn->unp_flags & UNP_OWANTCRED)
- MODULE_CALL_HOOK(uipc_unp_70_hook, (curlwp, control),
+ MODULE_HOOK_CALL(uipc_unp_70_hook, (curlwp, control),
stub_compat_70_unp_addsockcred(curlwp, control), control);
if (sbappendaddr(&so2->so_rcv, (const struct sockaddr *)sun, m,
control) == 0) {
@@ -533,7 +533,7 @@ unp_send(struct socket *so, struct mbuf
* SOCK_STREAM and SOCK_SEQPACKET.
*/
unp->unp_conn->unp_flags &= ~UNP_OWANTCRED;
- MODULE_CALL_HOOK(uipc_unp_70_hook, (curlwp, control),
+ MODULE_HOOK_CALL(uipc_unp_70_hook, (curlwp, control),
stub_compat_70_unp_addsockcred(curlwp, control),
control);
}
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.526 src/sys/kern/vfs_syscalls.c:1.527
--- src/sys/kern/vfs_syscalls.c:1.526 Wed Feb 20 10:05:20 2019
+++ src/sys/kern/vfs_syscalls.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.526 2019/02/20 10:05:20 hannken Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.527 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.526 2019/02/20 10:05:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.527 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1644,7 +1644,7 @@ do_sys_openat(lwp_t *l, int fdat, const
int error;
if (path == NULL) {
- MODULE_CALL_HOOK(vfs_openat_10_hook, (&pb), enosys(), error);
+ MODULE_HOOK_CALL(vfs_openat_10_hook, (&pb), enosys(), error);
if (error == ENOSYS)
goto no_compat;
if (error)
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.445 src/sys/net/if.c:1.446
--- src/sys/net/if.c:1.445 Tue Jan 29 09:28:50 2019
+++ src/sys/net/if.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.445 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: if.c,v 1.446 2019/03/01 11:06:57 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.445 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.446 2019/03/01 11:06:57 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3140,11 +3140,11 @@ doifioctl(struct socket *so, u_long cmd,
case SIOCINITIFADDR:
return EPERM;
default:
- MODULE_CALL_HOOK(uipc_syscalls_40_hook, (cmd, data), enosys(),
+ MODULE_HOOK_CALL(uipc_syscalls_40_hook, (cmd, data), enosys(),
error);
if (error != ENOSYS)
return error;
- MODULE_CALL_HOOK(uipc_syscalls_50_hook, (l, cmd, data),
+ MODULE_HOOK_CALL(uipc_syscalls_50_hook, (l, cmd, data),
enosys(), error);
if (error != ENOSYS)
return error;
@@ -3153,7 +3153,7 @@ doifioctl(struct socket *so, u_long cmd,
}
ifr = data;
- MODULE_CALL_HOOK(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
+ MODULE_HOOK_CALL(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
if (hook != ENOSYS) {
if (cmd != ocmd) {
oifr = data;
@@ -3254,7 +3254,7 @@ doifioctl(struct socket *so, u_long cmd,
error = EOPNOTSUPP;
else {
KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
- MODULE_CALL_HOOK(if_ifioctl_43_hook,
+ MODULE_HOOK_CALL(if_ifioctl_43_hook,
(so, ocmd, cmd, data, l), enosys(), error);
if (error == ENOSYS)
error = (*so->so_proto->pr_usrreqs->pr_ioctl)(so,
@@ -3410,7 +3410,7 @@ ifreq_setaddr(u_long cmd, struct ifreq *
u_long ocmd = cmd;
int hook;
- MODULE_CALL_HOOK(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
+ MODULE_HOOK_CALL(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
if (hook != ENOSYS) {
if (cmd != ocmd) {
oifr = (struct oifreq *)(void *)ifr;
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.181 src/sys/net/if_spppsubr.c:1.182
--- src/sys/net/if_spppsubr.c:1.181 Sun Jan 27 02:08:48 2019
+++ src/sys/net/if_spppsubr.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.181 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.182 2019/03/01 11:06:57 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.181 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.182 2019/03/01 11:06:57 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -5916,7 +5916,7 @@ sppp_params(struct sppp *sp, u_long cmd,
{
int ret;
- MODULE_CALL_HOOK(sppp_params_50_hook, (sp, cmd, data),
+ MODULE_HOOK_CALL(sppp_params_50_hook, (sp, cmd, data),
enosys(), ret);
if (ret != ENOSYS)
return ret;
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.247 src/sys/net/rtsock.c:1.248
--- src/sys/net/rtsock.c:1.247 Wed Feb 27 04:03:06 2019
+++ src/sys/net/rtsock.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.247 2019/02/27 04:03:06 ozaki-r Exp $ */
+/* $NetBSD: rtsock.c,v 1.248 2019/03/01 11:06:57 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.247 2019/02/27 04:03:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.248 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -333,11 +333,11 @@ sysctl_iflist(int af, struct rt_walkarg
error = sysctl_iflist_if(ifp, w, &info, len);
break;
case NET_RT_OOIFLIST: /* old _50 */
- MODULE_CALL_HOOK(rtsock_iflist_50_hook,
+ MODULE_HOOK_CALL(rtsock_iflist_50_hook,
(ifp, w, &info, len), enosys(), error);
break;
case NET_RT_OOOIFLIST: /* old _14 */
- MODULE_CALL_HOOK(rtsock_iflist_14_hook,
+ MODULE_HOOK_CALL(rtsock_iflist_14_hook,
(ifp, w, &info, len), enosys(), error);
break;
default:
@@ -367,7 +367,7 @@ sysctl_iflist(int af, struct rt_walkarg
case NET_RT_OIFLIST:
case NET_RT_OOIFLIST:
case NET_RT_OOOIFLIST:
- MODULE_CALL_HOOK(rtsock_iflist_70_hook,
+ MODULE_HOOK_CALL(rtsock_iflist_70_hook,
(w, ifa, &info), enosys(), error);
break;
default:
Index: src/sys/net/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.3 src/sys/net/rtsock_shared.c:1.4
--- src/sys/net/rtsock_shared.c:1.3 Tue Jan 29 09:28:51 2019
+++ src/sys/net/rtsock_shared.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.3 2019/01/29 09:28:51 pgoyette Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.4 2019/03/01 11:06:57 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.3 2019/01/29 09:28:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.4 2019/03/01 11:06:57 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_share
#define COMPATNAME(x) compat_50_ ## x
#define DOMAINNAME "oroute"
#define COMPATCALL(name, args) \
- MODULE_CALL_VOID_HOOK(rtsock_ ## name ## _50_hook, args, __nothing);
+ MODULE_HOOK_CALL_VOID(rtsock_ ## name ## _50_hook, args, __nothing);
#define RTS_CTASSERT(x) __nothing
CTASSERT(sizeof(struct ifa_xmsghdr) == 20);
DOMAIN_DEFINE(compat_50_routedomain); /* forward declare and add to link set */
@@ -1350,8 +1350,8 @@ COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
if (m == NULL)
return;
COMPATNAME(route_enqueue)(m, 0);
- MODULE_CALL_VOID_HOOK(rtsock_oifmsg_14_hook, (ifp), __nothing);
- MODULE_CALL_VOID_HOOK(rtsock_oifmsg_50_hook, (ifp), __nothing);
+ MODULE_HOOK_CALL_VOID(rtsock_oifmsg_14_hook, (ifp), __nothing);
+ MODULE_HOOK_CALL_VOID(rtsock_oifmsg_50_hook, (ifp), __nothing);
}
/*
@@ -1419,7 +1419,7 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
default:
panic("%s: unknown command %d", __func__, cmd);
}
- MODULE_CALL_VOID_HOOK(rtsock_newaddr_70_hook,
+ MODULE_HOOK_CALL_VOID(rtsock_newaddr_70_hook,
(ncmd, ifa), __nothing);
info.rti_info[RTAX_IFA] = sa = ifa->ifa_addr;
KASSERT(ifp->if_dl != NULL);
Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.63 src/sys/net80211/ieee80211_ioctl.c:1.64
--- src/sys/net80211/ieee80211_ioctl.c:1.63 Tue Jan 29 09:28:51 2019
+++ src/sys/net80211/ieee80211_ioctl.c Fri Mar 1 11:06:57 2019
@@ -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.63 2019/01/29 09:28:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.64 2019/03/01 11:06:57 pgoyette Exp $");
#endif
/*
@@ -2853,7 +2853,7 @@ ieee80211_ioctl(struct ieee80211com *ic,
case OSIOCG80211STATS:
case OSIOCG80211ZSTATS:
(void)module_autoload("compat_20", MODULE_CLASS_EXEC);
- MODULE_CALL_HOOK(ieee80211_ioctl_20_hook, (ic, cmd, data),
+ MODULE_HOOK_CALL(ieee80211_ioctl_20_hook, (ic, cmd, data),
enosys(), error);
break;
case SIOCG80211ZSTATS:
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.99 src/sys/opencrypto/cryptodev.c:1.100
--- src/sys/opencrypto/cryptodev.c:1.99 Sun Jan 27 02:08:48 2019
+++ src/sys/opencrypto/cryptodev.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.99 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.100 2019/03/01 11:06:57 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.99 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.100 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -441,7 +441,7 @@ reterr:
default:
/* Check for backward compatible commands */
- MODULE_CALL_HOOK(ocryptof_50_hook, (fp, cmd, data),
+ MODULE_HOOK_CALL(ocryptof_50_hook, (fp, cmd, data),
enosys(), error);
if (error == ENOSYS)
error = EINVAL;
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.12 src/sys/opencrypto/ocryptodev.c:1.13
--- src/sys/opencrypto/ocryptodev.c:1.12 Sun Jan 27 02:08:48 2019
+++ src/sys/opencrypto/ocryptodev.c Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.12 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.13 2019/03/01 11:06:57 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.12 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.13 2019/03/01 11:06:57 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -291,14 +291,14 @@ static void
crypto_50_init(void)
{
- MODULE_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
+ MODULE_HOOK_SET(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
}
static void
crypto_50_fini(void)
{
- MODULE_UNSET_HOOK(ocryptof_50_hook);
+ MODULE_HOOK_UNSET(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.2 src/sys/sys/module_hook.h:1.3
--- src/sys/sys/module_hook.h:1.2 Sun Jan 27 02:08:50 2019
+++ src/sys/sys/module_hook.h Fri Mar 1 11:06:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.2 2019/01/27 02:08:50 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.3 2019/03/01 11:06:57 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@ extern struct hook ## _t { \
type (*f)args; \
} hook __cacheline_aligned;
-#define MODULE_SET_HOOK(hook, waitchan, func) \
+#define MODULE_HOOK_SET(hook, waitchan, func) \
do { \
\
KASSERT(!hook.hooked); \
@@ -73,7 +73,7 @@ do { \
hook.hooked = true; \
} while /* CONSTCOND */ (0)
-#define MODULE_UNSET_HOOK(hook) \
+#define MODULE_HOOK_UNSET(hook) \
do { \
\
KASSERT(kernconfig_is_held()); \
@@ -103,7 +103,7 @@ do { \
pserialize_destroy(hook.psz); \
} while /* CONSTCOND */ (0)
-#define MODULE_CALL_HOOK(hook, args, default, retval) \
+#define MODULE_HOOK_CALL(hook, args, default, retval) \
do { \
bool __hooked; \
int __hook_s; \
@@ -125,7 +125,7 @@ do { \
} \
} while /* CONSTCOND */ (0)
-#define MODULE_CALL_VOID_HOOK(hook, args, default) \
+#define MODULE_HOOK_CALL_VOID(hook, args, default) \
do { \
bool __hooked; \
int __hook_s; \
