Module Name: src
Committed By: pgoyette
Date: Tue Sep 18 23:03:55 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: bio_30.c ccd_60.c
clockctl_50.c if_43.c if_spppsubr50.c kern_mod_80.c rtsock_14.c
sysmon_power_40.c usb_subr_30.c vnd_30.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_compat_80.c netbsd32_mod.c netbsd32_module.c
src/sys/dev [pgoyette-compat]: bio.c ccd.c clockctl.c vnd.c
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c rf_compat80.c
rf_netbsdkintf.c
src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
src/sys/dev/usb [pgoyette-compat]: ugen.c uhid.c usb.c
src/sys/dev/wscons [pgoyette-compat]: wsevent.c wsevent_50.c
src/sys/fs/puffs [pgoyette-compat]: puffs_compat.c puffs_msgif.c
src/sys/kern [pgoyette-compat]: sys_module.c
src/sys/net [pgoyette-compat]: if_spppsubr.c rtsock.c
src/sys/opencrypto [pgoyette-compat]: cryptodev.c ocryptodev.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Log Message:
The COMPAT_HOOK macros were renamed to MODULE_HOOK, adjust all callers
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.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/usb_subr_30.c src/sys/compat/common/vnd_30.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/common/ccd_60.c
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/kern_mod_80.c
cvs rdiff -u -r1.5.14.2 -r1.5.14.3 src/sys/compat/common/rtsock_14.c
cvs rdiff -u -r1.116.2.8 -r1.116.2.9 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.13.16.12 -r1.13.16.13 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.6.2.7 -r1.6.2.8 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.13.16.3 -r1.13.16.4 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.6 -r1.175.2.7 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.3 -r1.35.14.4 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.4 -r1.263.2.5 src/sys/dev/vnd.c
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/sys/dev/raidframe/rf_compat80.c
cvs rdiff -u -r1.356.2.4 -r1.356.2.5 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.58.2.3 -r1.58.2.4 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.139.2.3 -r1.139.2.4 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.3 -r1.101.2.4 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.4 -r1.168.2.5 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.4 -r1.37.2.5 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/wscons/wsevent_50.c
cvs rdiff -u -r1.4.16.2 -r1.4.16.3 src/sys/fs/puffs/puffs_compat.c
cvs rdiff -u -r1.101.10.4 -r1.101.10.5 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.23.2.11 -r1.23.2.12 src/sys/kern/sys_module.c
cvs rdiff -u -r1.179.2.5 -r1.179.2.6 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.238.2.8 -r1.238.2.9 src/sys/net/rtsock.c
cvs rdiff -u -r1.98.2.3 -r1.98.2.4 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.11.2.2 -r1.11.2.3 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/sys/sys/compat_stub.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/compat/common/bio_30.c
diff -u src/sys/compat/common/bio_30.c:1.1.2.2 src/sys/compat/common/bio_30.c:1.1.2.3
--- src/sys/compat/common/bio_30.c:1.1.2.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/bio_30.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bio_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: bio_30.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -88,8 +88,8 @@ compat_30_bio(void *cookie, u_long cmd,
}
}
-COMPAT_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
-COMPAT_UNSET_HOOK(compat_bio_30_hook);
+MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
+MODULE_UNSET_HOOK(compat_bio_30_hook);
void
bio_30_init(void)
Index: src/sys/compat/common/clockctl_50.c
diff -u src/sys/compat/common/clockctl_50.c:1.1.2.2 src/sys/compat/common/clockctl_50.c:1.1.2.3
--- src/sys/compat/common/clockctl_50.c:1.1.2.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/clockctl_50.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl_50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: clockctl_50.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,8 +122,8 @@ compat50_clockctlioctl(dev_t dev, u_long
return (error);
}
-COMPAT_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
-COMPAT_UNSET_HOOK(clockctl_ioctl_50_hook);
+MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
+MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
void
clockctl_50_init(void)
Index: src/sys/compat/common/if_spppsubr50.c
diff -u src/sys/compat/common/if_spppsubr50.c:1.1.2.2 src/sys/compat/common/if_spppsubr50.c:1.1.2.3
--- src/sys/compat/common/if_spppsubr50.c:1.1.2.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/if_spppsubr50.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -154,8 +154,8 @@ sppp_compat50_params(struct sppp *sp, u_
return 0;
}
-COMPAT_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
-COMPAT_UNSET_HOOK(sppp_params_50_hook);
+MODULE_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
+MODULE_UNSET_HOOK(sppp_params_50_hook);
void
if_spppsubr_50_init(void)
Index: src/sys/compat/common/sysmon_power_40.c
diff -u src/sys/compat/common/sysmon_power_40.c:1.1.2.2 src/sys/compat/common/sysmon_power_40.c:1.1.2.3
--- src/sys/compat/common/sysmon_power_40.c:1.1.2.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/sysmon_power_40.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power_40.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: sysmon_power_40.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,8 +89,8 @@ compat_40_sysmon_power(power_event_t *pe
return 0;
}
-COMPAT_SET_HOOK(compat_sysmon_power_40_hook, "smon60", compat_40_sysmon_power);
-COMPAT_UNSET_HOOK(compat_sysmon_power_40_hook);
+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)
Index: src/sys/compat/common/usb_subr_30.c
diff -u src/sys/compat/common/usb_subr_30.c:1.1.2.2 src/sys/compat/common/usb_subr_30.c:1.1.2.3
--- src/sys/compat/common/usb_subr_30.c:1.1.2.2 Tue Sep 18 01:15:57 2018
+++ src/sys/compat/common/usb_subr_30.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr_30.c,v 1.1.2.2 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -229,9 +229,9 @@ usb_copy_to_old30(struct usb_event *ue,
return 0;
}
-COMPAT_SET_HOOK2(usb_subr_30_hook, "usb_30", usbd_fill_deviceinfo_old,
+MODULE_SET_HOOK2(usb_subr_30_hook, "usb_30", usbd_fill_deviceinfo_old,
usb_copy_to_old30);
-COMPAT_UNSET_HOOK2(usb_subr_30_hook);
+MODULE_UNSET_HOOK2(usb_subr_30_hook);
void
usb_30_init(void)
Index: src/sys/compat/common/vnd_30.c
diff -u src/sys/compat/common/vnd_30.c:1.1.2.2 src/sys/compat/common/vnd_30.c:1.1.2.3
--- src/sys/compat/common/vnd_30.c:1.1.2.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/vnd_30.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: vnd_30.c,v 1.1.2.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,8 +115,8 @@ compat_30_vndioctl(u_long cmd, struct lw
return 0;
}
-COMPAT_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
-COMPAT_UNSET_HOOK(compat_vndioctl_30_hook);
+MODULE_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
+MODULE_UNSET_HOOK(compat_vndioctl_30_hook);
void
vnd_30_init(void)
Index: src/sys/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.1.2.7 src/sys/compat/common/ccd_60.c:1.1.2.8
--- src/sys/compat/common/ccd_60.c:1.1.2.7 Sun Sep 16 04:57:22 2018
+++ src/sys/compat/common/ccd_60.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.1.2.7 2018/09/16 04:57:22 pgoyette Exp $ */
+/* $NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 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.7 2018/09/16 04:57:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -91,8 +91,8 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
}
}
-COMPAT_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
-COMPAT_UNSET_HOOK(ccd_ioctl_60_hook);
+MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
+MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
void
ccd_60_init(void)
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.3 src/sys/compat/common/if_43.c:1.14.2.4
--- src/sys/compat/common/if_43.c:1.14.2.3 Tue Sep 18 01:15:57 2018
+++ src/sys/compat/common/if_43.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.3 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.4 2018/09/18 23:03:54 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.3 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.4 2018/09/18 23:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -77,9 +77,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
#include <compat/common/if_43.h>
#include <uvm/uvm_extern.h>
-/* COMPAT_HOOK for replacing the cmdcvt() function */
-COMPAT_CALL_HOOK_DECL(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
-COMPAT_CALL_HOOK(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
+/* MODULE_HOOK for replacing the cmdcvt() function */
+MODULE_CALL_HOOK_DECL(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
+MODULE_CALL_HOOK(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
u_long
compat_cvtcmd(u_long cmd)
Index: src/sys/compat/common/kern_mod_80.c
diff -u src/sys/compat/common/kern_mod_80.c:1.1.2.5 src/sys/compat/common/kern_mod_80.c:1.1.2.6
--- src/sys/compat/common/kern_mod_80.c:1.1.2.5 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/kern_mod_80.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mod_80.c,v 1.1.2.5 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: kern_mod_80.c,v 1.1.2.6 2018/09/18 23:03:54 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.5 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.6 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -151,8 +151,8 @@ compat_80_modstat(int cmd, struct iovec
return error;
}
-COMPAT_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
-COMPAT_UNSET_HOOK(compat_modstat_80_hook);
+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)
Index: src/sys/compat/common/rtsock_14.c
diff -u src/sys/compat/common/rtsock_14.c:1.5.14.2 src/sys/compat/common/rtsock_14.c:1.5.14.3
--- src/sys/compat/common/rtsock_14.c:1.5.14.2 Mon Sep 17 11:04:30 2018
+++ src/sys/compat/common/rtsock_14.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_14.c,v 1.5.14.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: rtsock_14.c,v 1.5.14.3 2018/09/18 23:03:54 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.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.5.14.3 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -170,9 +170,9 @@ compat_14_iflist(struct ifnet *ifp, stru
return 0;
}
-COMPAT_SET_HOOK2(rtsock14_hook, "rts_14", compat_14_rt_oifmsg,
+MODULE_SET_HOOK2(rtsock14_hook, "rts_14", compat_14_rt_oifmsg,
compat_14_iflist);
-COMPAT_UNSET_HOOK2(rtsock14_hook);
+MODULE_UNSET_HOOK2(rtsock14_hook);
void
rtsock_14_init(void)
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.8 src/sys/compat/netbsd32/netbsd32.h:1.116.2.9
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.8 Tue Sep 18 10:35:04 2018
+++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.8 2018/09/18 10:35:04 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.9 2018/09/18 23:03:54 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -46,7 +46,7 @@
#include <sys/shm.h>
#include <sys/ucontext.h>
#include <sys/ucred.h>
-#include <sys/compat_hook.h>
+#include <sys/module_hook.h>
#include <compat/sys/ucontext.h>
#include <compat/sys/mount.h>
#include <compat/sys/signal.h>
@@ -1177,7 +1177,7 @@ extern const char * const netbsd32_sysca
extern struct sysctlnode netbsd32_sysctl_root;
struct netbsd32_modctl_args;
-COMPAT_HOOK(compat32_80_modctl_hook,
+MODULE_HOOK(compat32_80_modctl_hook,
(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
/*
Index: src/sys/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.5
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.4 Tue Sep 18 10:35:04 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.4 2018/09/18 10:35:04 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.5 2018/09/18 23:03:54 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.4 2018/09/18 10:35:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.5 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -175,8 +175,8 @@ netbsd32_80_modctl(struct lwp *lwp, cons
return error;
}
-COMPAT_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80", netbsd32_80_modctl);
-COMPAT_UNSET_HOOK(compat32_80_modctl_hook);
+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");
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.12 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.13
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.12 Tue Sep 18 10:35:04 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.13 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.13 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include <sys/module.h>
#include <sys/exec.h>
#include <sys/exec_elf.h>
-#include <sys/compat_hook.h>
+#include <sys/module_hook.h>
#include <compat/netbsd32/netbsd32_sysctl.h>
#include <compat/netbsd32/netbsd32_exec.h>
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.7 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.8
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.7 Tue Sep 18 10:35:04 2018
+++ src/sys/compat/netbsd32/netbsd32_module.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.7 2018/09/18 10:35:04 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.7 2018/09/18 10:35:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -201,12 +201,12 @@ compat32_80_modctl_compat_stub(struct lw
}
/* Module hook for netbsd32_80_modctl */
-COMPAT_CALL_HOOK_DECL(compat32_80_modctl_hook, f,
+MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook, f,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result),
(lwp, uap, result),
enosys());
-COMPAT_CALL_HOOK(compat32_80_modctl_hook, f,
+MODULE_CALL_HOOK(compat32_80_modctl_hook, f,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result),
(lwp, uap, result),
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.13.16.3 src/sys/dev/bio.c:1.13.16.4
--- src/sys/dev/bio.c:1.13.16.3 Tue Sep 18 01:15:57 2018
+++ src/sys/dev/bio.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.13.16.3 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.3 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -115,10 +115,10 @@ bioclose(dev_t dev, int flags, int mode,
}
/* Hook up the compat_bio_30 routine */
-COMPAT_CALL_HOOK_DECL(compat_bio_30_hook, f,
+MODULE_CALL_HOOK_DECL(compat_bio_30_hook, f,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
(cookie, cmd, addr, ff), enosys());
-COMPAT_CALL_HOOK(compat_bio_30_hook, f,
+MODULE_CALL_HOOK(compat_bio_30_hook, f,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
(cookie, cmd, addr, ff), enosys());
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.175.2.6 src/sys/dev/ccd.c:1.175.2.7
--- src/sys/dev/ccd.c:1.175.2.6 Tue Sep 18 01:15:57 2018
+++ src/sys/dev/ccd.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.175.2.6 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.6 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1061,11 +1061,11 @@ ccdread(dev_t dev, struct uio *uio, int
* This looks ugly, since we pass the "real" ioctl function as an
* argument to the compat_xxx function.
*/
-COMPAT_CALL_HOOK_DECL(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
+MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
struct lwp *)),
(dev, cmd, data, flag, l, ccdioctl), enosys());
-COMPAT_CALL_HOOK(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
+MODULE_CALL_HOOK(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
struct lwp *)),
(dev, cmd, data, flag, l, ccdioctl), enosys());
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.3 src/sys/dev/clockctl.c:1.35.14.4
--- src/sys/dev/clockctl.c:1.35.14.3 Tue Sep 18 01:15:57 2018
+++ src/sys/dev/clockctl.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.3 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.4 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.3 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.4 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -201,10 +201,10 @@ clockctl_modcmd(modcmd_t cmd, void *data
}
/* Hook the compat_50 stuff */
-COMPAT_CALL_HOOK_DECL(clockctl_ioctl_50_hook, f,
+MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook, f,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
(dev, cmd, data, flags, l), enosys());
-COMPAT_CALL_HOOK(clockctl_ioctl_50_hook, f,
+MODULE_CALL_HOOK(clockctl_ioctl_50_hook, f,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
(dev, cmd, data, flags, l), enosys());
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.263.2.4 src/sys/dev/vnd.c:1.263.2.5
--- src/sys/dev/vnd.c:1.263.2.4 Tue Sep 18 01:15:57 2018
+++ src/sys/dev/vnd.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.263.2.4 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.263.2.5 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.4 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.5 2018/09/18 23:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1111,12 +1111,12 @@ vndioctl_get(struct lwp *l, void *data,
}
}
-COMPAT_CALL_HOOK_DECL(compat_vndioctl_30_hook, f,
+MODULE_CALL_HOOK_DECL(compat_vndioctl_30_hook, f,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)),
(cmd, l, data, unit, vattr, ff),
enosys());
-COMPAT_CALL_HOOK(compat_vndioctl_30_hook, f,
+MODULE_CALL_HOOK(compat_vndioctl_30_hook, f,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)),
(cmd, l, data, unit, vattr, ff),
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.3 src/sys/dev/raidframe/rf_compat50.c:1.3.2.4
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.3 Mon Sep 17 11:04:30 2018
+++ src/sys/dev/raidframe/rf_compat50.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.3 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -239,8 +239,8 @@ raidframe_ioctl_50(int cmd, int initted,
return EPASSTHROUGH;
}
-COMPAT_SET_HOOK(raidframe50_ioctl_hook, "raid50", raidframe_ioctl_50);
-COMPAT_UNSET_HOOK(raidframe50_ioctl_hook)
+MODULE_SET_HOOK(raidframe50_ioctl_hook, "raid50", raidframe_ioctl_50);
+MODULE_UNSET_HOOK(raidframe50_ioctl_hook)
void
raidframe_50_init(void)
Index: src/sys/dev/raidframe/rf_compat80.c
diff -u src/sys/dev/raidframe/rf_compat80.c:1.2.2.3 src/sys/dev/raidframe/rf_compat80.c:1.2.2.4
--- src/sys/dev/raidframe/rf_compat80.c:1.2.2.3 Mon Sep 17 11:04:30 2018
+++ src/sys/dev/raidframe/rf_compat80.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat80.c,v 1.2.2.3 2018/09/17 11:04:30 pgoyette Exp $ */
+/* $NetBSD: rf_compat80.c,v 1.2.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
/*
* Copyright (c) 2017 Matthew R. Green
@@ -264,8 +264,8 @@ int error;
return EPASSTHROUGH;
}
-COMPAT_SET_HOOK(raidframe80_ioctl_hook, "raid80", raidframe_ioctl_80);
-COMPAT_UNSET_HOOK(raidframe80_ioctl_hook)
+MODULE_SET_HOOK(raidframe80_ioctl_hook, "raid80", raidframe_ioctl_80);
+MODULE_UNSET_HOOK(raidframe80_ioctl_hook)
void
raidframe_80_init(void)
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.4 src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.5
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.4 Tue Sep 18 01:15:57 2018
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.4 2018/09/18 01:15:57 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.4 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1038,23 +1038,23 @@ raid_detach_unlocked(struct raid_softc *
}
/* Hooks to call the 5.0 and 8.0 ioctl compat code */
-COMPAT_CALL_HOOK_DECL(raidframe50_ioctl_hook, f,
+MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
enosys());
-COMPAT_CALL_HOOK(raidframe50_ioctl_hook, f,
+MODULE_CALL_HOOK(raidframe50_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
enosys());
-COMPAT_CALL_HOOK_DECL(raidframe80_ioctl_hook, f,
+MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
enosys());
-COMPAT_CALL_HOOK(raidframe80_ioctl_hook, f,
+MODULE_CALL_HOOK(raidframe80_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.58.2.3 src/sys/dev/sysmon/sysmon_power.c:1.58.2.4
--- src/sys/dev/sysmon/sysmon_power.c:1.58.2.3 Tue Sep 18 01:15:58 2018
+++ src/sys/dev/sysmon/sysmon_power.c Tue Sep 18 23:03:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.58.2.3 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.3 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -318,10 +318,10 @@ sysmon_power_event_queue_flush(void)
/*
* Call the compat hook function
*/
-COMPAT_CALL_HOOK_DECL(compat_sysmon_power_40_hook, f,
+MODULE_CALL_HOOK_DECL(compat_sysmon_power_40_hook, f,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
(pev, pswitch, event), enosys());
-COMPAT_CALL_HOOK(compat_sysmon_power_40_hook, f,
+MODULE_CALL_HOOK(compat_sysmon_power_40_hook, f,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
(pev, pswitch, event), enosys());
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.139.2.3 src/sys/dev/usb/ugen.c:1.139.2.4
--- src/sys/dev/usb/ugen.c:1.139.2.3 Tue Sep 18 01:15:58 2018
+++ src/sys/dev/usb/ugen.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.139.2.3 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.3 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1439,7 +1439,7 @@ ugen_get_alt_index(struct ugen_softc *sc
return usbd_get_interface_altindex(iface);
}
-COMPAT_CALL_HOOK_DECL(usb_subr_30_hook, f1,
+MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
(struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
size_t, int, int), int (*printBCD)(char *, size_t, int)),
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.101.2.3 src/sys/dev/usb/uhid.c:1.101.2.4
--- src/sys/dev/usb/uhid.c:1.101.2.3 Tue Sep 18 01:15:58 2018
+++ src/sys/dev/usb/uhid.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.101.2.3 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: uhid.c,v 1.101.2.4 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.3 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.4 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -513,7 +513,7 @@ uhidwrite(dev_t dev, struct uio *uio, in
return error;
}
-COMPAT_CALL_HOOK_DECL(usb_subr_30_hook, f1,
+MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
(struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
size_t, int, int), int (*printBCD)(char *, size_t, int)),
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.168.2.4 src/sys/dev/usb/usb.c:1.168.2.5
--- src/sys/dev/usb/usb.c:1.168.2.4 Tue Sep 18 01:15:58 2018
+++ src/sys/dev/usb/usb.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.168.2.4 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: usb.c,v 1.168.2.5 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.4 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.5 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -647,10 +647,10 @@ usbopen(dev_t dev, int flag, int mode, s
}
/* Call hook for usbd30_fill_device_info_old() */
-COMPAT_CALL_HOOK_DECL(usb_subr_30_hook, f2,
+MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f2,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
(ue, ueo, uio), enosys());
-COMPAT_CALL_HOOK(usb_subr_30_hook, f2,
+MODULE_CALL_HOOK(usb_subr_30_hook, f2,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
(ue, ueo, uio), enosys());
@@ -727,13 +727,13 @@ usbclose(dev_t dev, int flag, int mode,
}
/* Call the hook for usb30_copy_to_old() */
-COMPAT_CALL_HOOK_DECL(usb_subr_30_hook, f1,
+MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
(struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
size_t, int, int), int (*printBCD)(char *, size_t, int)),
(udev, addr, usedev, fill_devinfo_vp, printBCD),
enosys());
-COMPAT_CALL_HOOK(usb_subr_30_hook, f1,
+MODULE_CALL_HOOK(usb_subr_30_hook, f1,
(struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
size_t, int, int), int (*printBCD)(char *, size_t, int)),
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.37.2.4 src/sys/dev/wscons/wsevent.c:1.37.2.5
--- src/sys/dev/wscons/wsevent.c:1.37.2.4 Tue Sep 18 01:15:58 2018
+++ src/sys/dev/wscons/wsevent.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.37.2.4 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.37.2.5 2018/09/18 23:03:55 pgoyette Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.4 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.5 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -189,10 +189,10 @@ wsevent_fini(struct wseventvar *ev)
softint_disestablish(ev->sih);
}
-COMPAT_CALL_HOOK_DECL(wsevent_50_copyout_events_hook, f,
+MODULE_CALL_HOOK_DECL(wsevent_50_copyout_events_hook, f,
(const struct wscons_event *events, int cnt, struct uio *uio),
(events, cnt, uio), enosys());
-COMPAT_CALL_HOOK(wsevent_50_copyout_events_hook, f,
+MODULE_CALL_HOOK(wsevent_50_copyout_events_hook, f,
(const struct wscons_event *events, int cnt, struct uio *uio),
(events, cnt, uio), enosys());
Index: src/sys/dev/wscons/wsevent_50.c
diff -u src/sys/dev/wscons/wsevent_50.c:1.1.2.4 src/sys/dev/wscons/wsevent_50.c:1.1.2.5
--- src/sys/dev/wscons/wsevent_50.c:1.1.2.4 Mon Sep 17 11:04:31 2018
+++ src/sys/dev/wscons/wsevent_50.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent_50.c,v 1.1.2.4 2018/09/17 11:04:31 pgoyette Exp $ */
+/* $NetBSD: wsevent_50.c,v 1.1.2.5 2018/09/18 23:03:55 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.4 2018/09/17 11:04:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.1.2.5 2018/09/18 23:03:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -144,9 +144,9 @@ wsevent_copyout_events50(const struct ws
return 0;
}
-COMPAT_SET_HOOK(wsevent_50_copyout_events_hook, "wsc_50",
+MODULE_SET_HOOK(wsevent_50_copyout_events_hook, "wsc_50",
wsevent_copyout_events50);
-COMPAT_UNSET_HOOK(wsevent_50_copyout_events_hook);
+MODULE_UNSET_HOOK(wsevent_50_copyout_events_hook);
void
wsevent_50_init(void)
Index: src/sys/fs/puffs/puffs_compat.c
diff -u src/sys/fs/puffs/puffs_compat.c:1.4.16.2 src/sys/fs/puffs/puffs_compat.c:1.4.16.3
--- src/sys/fs/puffs/puffs_compat.c:1.4.16.2 Mon Sep 17 11:04:31 2018
+++ src/sys/fs/puffs/puffs_compat.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_compat.c,v 1.4.16.2 2018/09/17 11:04:31 pgoyette Exp $ */
+/* $NetBSD: puffs_compat.c,v 1.4.16.3 2018/09/18 23:03:55 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.2 2018/09/17 11:04:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.4.16.3 2018/09/18 23:03:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -437,9 +437,9 @@ puffs_compat_incoming(struct puffs_req *
return 0;
}
-COMPAT_SET_HOOK2(puffs50_compat_hook, "pffs50", puffs_compat_outgoing,
+MODULE_SET_HOOK2(puffs50_compat_hook, "pffs50", puffs_compat_outgoing,
puffs_compat_incoming);
-COMPAT_UNSET_HOOK2(puffs50_compat_hook);
+MODULE_UNSET_HOOK2(puffs50_compat_hook);
void puffs_50_init(void)
{
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.101.10.4 src/sys/fs/puffs/puffs_msgif.c:1.101.10.5
--- src/sys/fs/puffs/puffs_msgif.c:1.101.10.4 Tue Sep 18 01:15:58 2018
+++ src/sys/fs/puffs/puffs_msgif.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.101.10.4 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.101.10.5 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.4 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.5 2018/09/18 23:03:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -325,18 +325,18 @@ puffs_getmsgid(struct puffs_mount *pmp)
/* Routines to call the compat hooks */
/* Out-going */
-COMPAT_CALL_HOOK_DECL(puffs50_compat_hook, f1,
+MODULE_CALL_HOOK_DECL(puffs50_compat_hook, f1,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
(oreq, creqp, deltap), enosys());
-COMPAT_CALL_HOOK(puffs50_compat_hook, f1,
+MODULE_CALL_HOOK(puffs50_compat_hook, f1,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
(oreq, creqp, deltap), enosys());
/* Incoming */
-COMPAT_CALL_HOOK_DECL(puffs50_compat_hook, f2,
+MODULE_CALL_HOOK_DECL(puffs50_compat_hook, f2,
(struct puffs_req *oreq, struct puffs_req *creqp),
(oreq, creqp), enosys());
-COMPAT_CALL_HOOK(puffs50_compat_hook, f2,
+MODULE_CALL_HOOK(puffs50_compat_hook, f2,
(struct puffs_req *oreq, struct puffs_req *creqp),
(oreq, creqp), enosys());
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.23.2.11 src/sys/kern/sys_module.c:1.23.2.12
--- src/sys/kern/sys_module.c:1.23.2.11 Tue Sep 18 01:15:58 2018
+++ src/sys/kern/sys_module.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.23.2.11 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: sys_module.c,v 1.23.2.12 2018/09/18 23:03:55 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.11 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.12 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -261,10 +261,10 @@ handle_modctl_stat(struct iovec *iov, vo
return error;
}
-/* COMPAT_HOOK glue for modstat_80 */
-COMPAT_CALL_HOOK_DECL(compat_modstat_80_hook, f,
+/* MODULE_HOOK glue for modstat_80 */
+MODULE_CALL_HOOK_DECL(compat_modstat_80_hook, f,
(int cmd, struct iovec *iov, void *arg), (cmd, iov, arg), enosys());
-COMPAT_CALL_HOOK(compat_modstat_80_hook, f,
+MODULE_CALL_HOOK(compat_modstat_80_hook, f,
(int cmd, struct iovec *iov, void *arg), (cmd, iov, arg), enosys());
int
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.179.2.5 src/sys/net/if_spppsubr.c:1.179.2.6
--- src/sys/net/if_spppsubr.c:1.179.2.5 Tue Sep 18 01:15:58 2018
+++ src/sys/net/if_spppsubr.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.179.2.5 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.179.2.6 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.5 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.6 2018/09/18 23:03:55 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -5612,9 +5612,9 @@ sppp_suggest_ip6_addr(struct sppp *sp, s
#endif /*INET6*/
/* Hook the sppp_params50 compat code */
-COMPAT_CALL_HOOK_DECL(sppp_params_50_hook, f,
+MODULE_CALL_HOOK_DECL(sppp_params_50_hook, f,
(struct sppp *sp, u_long cmd, void *data), (sp, cmd, data), enosys());
-COMPAT_CALL_HOOK(sppp_params_50_hook, f,
+MODULE_CALL_HOOK(sppp_params_50_hook, f,
(struct sppp *sp, u_long cmd, void *data), (sp, cmd, data), enosys());
/*
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.238.2.8 src/sys/net/rtsock.c:1.238.2.9
--- src/sys/net/rtsock.c:1.238.2.8 Tue Sep 18 01:15:58 2018
+++ src/sys/net/rtsock.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.238.2.8 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: rtsock.c,v 1.238.2.9 2018/09/18 23:03:55 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.8 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.9 2018/09/18 23:03:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1377,24 +1377,24 @@ COMPATNAME(rt_missmsg)(int type, const s
}
/*
- * COMPAT_HOOK glue for rtsock14_oifmsg and rtsock14_iflist
+ * MODULE_HOOK glue for rtsock14_oifmsg and rtsock14_iflist
*
* Make them static since this same code is compiled for different
* COMPAT_xx options and we would otherwise end up with duplicate
* global symbols.
*/
-COMPAT_CALL_HOOK_DECL(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
+MODULE_CALL_HOOK_DECL(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
#ifndef COMPAT_RTSOCK
-COMPAT_CALL_HOOK(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
+MODULE_CALL_HOOK(rtsock14_hook, f1, (struct ifnet *ifp), (ifp), enosys());
#endif
-COMPAT_CALL_HOOK_DECL(rtsock14_hook, f2,
+MODULE_CALL_HOOK_DECL(rtsock14_hook, f2,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
enosys());
#ifndef COMPAT_RTSOCK
-COMPAT_CALL_HOOK(rtsock14_hook, f2,
+MODULE_CALL_HOOK(rtsock14_hook, f2,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.98.2.3 src/sys/opencrypto/cryptodev.c:1.98.2.4
--- src/sys/opencrypto/cryptodev.c:1.98.2.3 Tue Sep 18 01:15:58 2018
+++ src/sys/opencrypto/cryptodev.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.98.2.3 2018/09/18 01:15:58 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.98.2.4 2018/09/18 23:03:55 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.3 2018/09/18 01:15:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.4 2018/09/18 23:03:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,9 +220,9 @@ cryptof_write(file_t *fp, off_t *poff,
}
/* Hook the ocryptodev 50 compat code */
-COMPAT_CALL_HOOK_DECL(ocryptof_50_hook, f,
+MODULE_CALL_HOOK_DECL(ocryptof_50_hook, f,
(struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
-COMPAT_CALL_HOOK(ocryptof_50_hook, f,
+MODULE_CALL_HOOK(ocryptof_50_hook, f,
(struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
/* ARGSUSED */
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.2 src/sys/opencrypto/ocryptodev.c:1.11.2.3
--- src/sys/opencrypto/ocryptodev.c:1.11.2.2 Mon Sep 17 11:04:31 2018
+++ src/sys/opencrypto/ocryptodev.c Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.11.2.2 2018/09/17 11:04:31 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.11.2.3 2018/09/18 23:03:55 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.2 2018/09/17 11:04:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.3 2018/09/18 23:03:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -285,8 +285,8 @@ ocryptodev_msession(struct fcrypt *fcr,
return 0;
}
-COMPAT_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
-COMPAT_UNSET_HOOK(ocryptof_50_hook);
+MODULE_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
+MODULE_UNSET_HOOK(ocryptof_50_hook);
void
cryptodev_50_init(void)
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.27 src/sys/sys/compat_stub.h:1.1.2.28
--- src/sys/sys/compat_stub.h:1.1.2.27 Tue Sep 18 21:38:08 2018
+++ src/sys/sys/compat_stub.h Tue Sep 18 23:03:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.27 2018/09/18 21:38:08 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.28 2018/09/18 23:03:55 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@ struct ntptimeval;
extern void (*vec_ntp_gettime)(struct ntptimeval *);
extern int (*vec_ntp_timestatus)(void);
-COMPAT_HOOK2(ntp_gettime_hooks, (struct ntptimeval *), (void))
+MODULE_HOOK2(ntp_gettime_hooks, (struct ntptimeval *), (void))
/*
* usb devinfo compatability
@@ -56,7 +56,7 @@ struct usb_device_info_old;
struct usb_event;
struct usb_event_old;
struct uio;
-COMPAT_HOOK2(usb_subr_30_hook,
+MODULE_HOOK2(usb_subr_30_hook,
(struct usbd_device *, struct usb_device_info_old *, int,
void (*)(struct usbd_device *, char *, size_t, char *, size_t, int, int),
int (*)(char *, size_t, int)),
@@ -66,27 +66,27 @@ COMPAT_HOOK2(usb_subr_30_hook,
* Routine vector for dev/ccd ioctl()
*/
-COMPAT_HOOK(ccd_ioctl_60_hook, (dev_t, u_long, void *, int, struct lwp *,
+MODULE_HOOK(ccd_ioctl_60_hook, (dev_t, u_long, void *, int, struct lwp *,
int (*f)(dev_t, u_long, void *, int, struct lwp *)))
/*
* Routine vector for dev/clockctl ioctl()
*/
-COMPAT_HOOK(clockctl_ioctl_50_hook, (dev_t, u_long, void *, int, struct lwp *));
+MODULE_HOOK(clockctl_ioctl_50_hook, (dev_t, u_long, void *, int, struct lwp *));
/*
* if_sppp device compatability ioctl subroutine
*/
struct sppp;
-COMPAT_HOOK(sppp_params_50_hook, (struct sppp *, u_long, void *));
+MODULE_HOOK(sppp_params_50_hook, (struct sppp *, u_long, void *));
/*
* cryptodev compatability ioctl
*/
-COMPAT_HOOK(ocryptof_50_hook, (struct file *, u_long, void *));
+MODULE_HOOK(ocryptof_50_hook, (struct file *, u_long, void *));
/*
* raidframe compatability
@@ -94,9 +94,9 @@ COMPAT_HOOK(ocryptof_50_hook, (struct fi
struct RF_Config_s;
struct RF_Raid_s;
-COMPAT_HOOK(raidframe50_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
+MODULE_HOOK(raidframe50_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
struct RF_Config_s **));
-COMPAT_HOOK(raidframe80_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
+MODULE_HOOK(raidframe80_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
struct RF_Config_s **));
/*
@@ -104,7 +104,7 @@ COMPAT_HOOK(raidframe80_ioctl_hook, (int
*/
struct puffs_req;
-COMPAT_HOOK2(puffs50_compat_hook,
+MODULE_HOOK2(puffs50_compat_hook,
(struct puffs_req *, struct puffs_req **, ssize_t *), /* outgoing */
(struct puffs_req *, struct puffs_req *)); /* incoming */
@@ -114,7 +114,7 @@ COMPAT_HOOK2(puffs50_compat_hook,
struct wscons_event;
struct uio;
-COMPAT_HOOK(wsevent_50_copyout_events_hook,
+MODULE_HOOK(wsevent_50_copyout_events_hook,
(const struct wscons_event *, int, struct uio *));
/*
@@ -123,14 +123,14 @@ COMPAT_HOOK(wsevent_50_copyout_events_ho
struct power_event;
struct sysmon_pswitch;
-COMPAT_HOOK(compat_sysmon_power_40_hook, (struct power_event *,
+MODULE_HOOK(compat_sysmon_power_40_hook, (struct power_event *,
struct sysmon_pswitch *, int));
/*
* compat_bio indirect function pointer
*/
-COMPAT_HOOK(compat_bio_30_hook, (void *, u_long, void *,
+MODULE_HOOK(compat_bio_30_hook, (void *, u_long, void *,
int(*)(void *, u_long, void *)));
/*
@@ -138,7 +138,7 @@ COMPAT_HOOK(compat_bio_30_hook, (void *,
* XXX there's some _50 code mixed in
*/
struct vattr;
-COMPAT_HOOK(compat_vndioctl_30_hook, (u_long, struct lwp *, void *, int,
+MODULE_HOOK(compat_vndioctl_30_hook, (u_long, struct lwp *, void *, int,
struct vattr *, int (*)(struct lwp *, void *, int, struct vattr *)));
/*
@@ -148,9 +148,9 @@ COMPAT_HOOK(compat_vndioctl_30_hook, (u_
struct ieee80211_ostats;
struct ieee80211_stats;
-COMPAT_HOOK(ieee80211_ostats_hook, (struct ieee80211_ostats *,
+MODULE_HOOK(ieee80211_ostats_hook, (struct ieee80211_ostats *,
struct ieee80211_stats *));
-COMPAT_HOOK(ieee80211_get_ostats_20_hook, (int));
+MODULE_HOOK(ieee80211_get_ostats_20_hook, (int));
extern int (*ieee80211_get_ostats_20)(struct ieee80211_ostats *,
struct ieee80211_stats *);
@@ -163,14 +163,14 @@ extern int (*if43_20_cvtcmd)(int);
struct ifnet;
struct rt_walkarg;
struct rt_addrinfo;
-COMPAT_HOOK2(rtsock14_hook, (struct ifnet *),
+MODULE_HOOK2(rtsock14_hook, (struct ifnet *),
(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *, size_t));
/*
* modctl handler for old style OSTAT
*/
struct iovec;
-COMPAT_HOOK(compat_modstat_80_hook, (int, struct iovec *, void *));
+MODULE_HOOK(compat_modstat_80_hook, (int, struct iovec *, void *));
/*
* mask for kern_sig_43's killpg
