Module Name: src
Committed By: pgoyette
Date: Mon Jan 14 13:34:28 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
src/sys/arch/sparc/fpu [pgoyette-compat]: fpu.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
src/sys/compat/common [pgoyette-compat]: if_43.c rtsock_14.c
rtsock_50.c rtsock_70.c sysmon_power_40.c uipc_usrreq_70.c
src/sys/compat/net [pgoyette-compat]: if.h route.h
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_kern_proc.c netbsd32_module.c
src/sys/compat/sys [pgoyette-compat]: socket.h
src/sys/dev [pgoyette-compat]: bio.c ccd.c clockctl.c vnd.c
src/sys/dev/raidframe [pgoyette-compat]: rf_netbsdkintf.c
src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
src/sys/dev/usb [pgoyette-compat]: ugen.c uhid.c usb.c
src/sys/dev/wscons [pgoyette-compat]: wsevent.c
src/sys/fs/puffs [pgoyette-compat]: puffs_compat.c puffs_msgif.c
puffs_sys.h
src/sys/kern [pgoyette-compat]: 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 [pgoyette-compat]: if.c if_spppsubr.c route.h rtsock.c
src/sys/net80211 [pgoyette-compat]: ieee80211_ioctl.c
src/sys/opencrypto [pgoyette-compat]: cryptodev.c
src/sys/sys [pgoyette-compat]: compat_stub.h module_hook.h
Log Message:
Create a variant of the HOOK macros that handles hook routines of
type void, and use them where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.13 -r1.115.2.14 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.15.2.9 -r1.15.2.10 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/mips/netbsd32_machdep_16.c
cvs rdiff -u -r1.27.46.2 -r1.27.46.3 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.110.14.2 -r1.110.14.3 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
cvs rdiff -u -r1.14.2.11 -r1.14.2.12 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.5.14.5 -r1.5.14.6 src/sys/compat/common/rtsock_14.c
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/sys/compat/common/rtsock_70.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/sysmon_power_40.c
cvs rdiff -u -r1.1.20.3 -r1.1.20.4 src/sys/compat/common/uipc_usrreq_70.c
cvs rdiff -u -r1.4.14.2 -r1.4.14.3 src/sys/compat/net/if.h
cvs rdiff -u -r1.2.14.2 -r1.2.14.3 src/sys/compat/net/route.h
cvs rdiff -u -r1.116.2.16 -r1.116.2.17 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.6.2.10 -r1.6.2.11 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/compat/sys/socket.h
cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.9 -r1.175.2.10 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.9 -r1.35.14.10 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.11 -r1.263.2.12 src/sys/dev/vnd.c
cvs rdiff -u -r1.356.2.7 -r1.356.2.8 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.58.2.6 -r1.58.2.7 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.139.2.7 -r1.139.2.8 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.6 -r1.101.2.7 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.8 -r1.168.2.9 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.7 -r1.37.2.8 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.4.16.4 -r1.4.16.5 src/sys/fs/puffs/puffs_compat.c
cvs rdiff -u -r1.101.10.7 -r1.101.10.8 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.90.16.2 -r1.90.16.3 src/sys/fs/puffs/puffs_sys.h
cvs rdiff -u -r1.209.2.11 -r1.209.2.12 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.89.16.5 -r1.89.16.6 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.23.2.14 -r1.23.2.15 src/sys/kern/sys_module.c
cvs rdiff -u -r1.32.16.7 -r1.32.16.8 src/sys/kern/sysv_ipc.c
cvs rdiff -u -r1.275.2.6 -r1.275.2.7 src/sys/kern/tty.c
cvs rdiff -u -r1.37.16.3 -r1.37.16.4 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.183.2.7 -r1.183.2.8 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.518.2.3 -r1.518.2.4 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.419.2.19 -r1.419.2.20 src/sys/net/if.c
cvs rdiff -u -r1.179.2.8 -r1.179.2.9 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.117.2.4 -r1.117.2.5 src/sys/net/route.h
cvs rdiff -u -r1.238.2.18 -r1.238.2.19 src/sys/net/rtsock.c
cvs rdiff -u -r1.60.16.5 -r1.60.16.6 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.98.2.8 -r1.98.2.9 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.1.2.47 -r1.1.2.48 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/sys/module_hook.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.13 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.14
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.13 Sun Jan 13 10:49:49 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.13 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.14 2019/01/14 13:34:26 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.13 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.14 2019/01/14 13:34:26 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -275,9 +275,9 @@ netbsd32_sendsig_siginfo(const ksiginfo_
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask));
-MODULE_CALL_HOOK(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
netbsd32_sendsig_siginfo(ksi, mask));
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.10 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.11
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.10 Wed Dec 26 14:01:31 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2018/12/26 14:01:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.11 2019/01/14 13:34:26 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2018/12/26 14:01:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.11 2019/01/14 13:34:26 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -84,7 +84,7 @@ void netbsd32_sendsig_siginfo(const ksig
int check_sigcontext32(struct lwp *, const struct netbsd32_sigcontext *);
-int netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
+void netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
extern struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
@@ -177,15 +177,13 @@ netbsd32_sendsig_sigcontext(const ksigin
netbsd32_buildcontext(l, tf, fp, catcher, onstack);
}
-int
+void
netbsd32_sendsig_16(const ksiginfo_t *ksi, const sigset_t *mask)
{
if (curproc->p_sigacts->sa_sigdesc[ksi->ksi_signo].sd_vers < 2)
netbsd32_sendsig_sigcontext(ksi, mask);
else
netbsd32_sendsig_siginfo(ksi, mask);
-
- return 0;
}
int
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.9 src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.10
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.9 Sun Jan 13 10:49:49 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.15.2.9 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.15.2.10 2019/01/14 13:34:26 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.9 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.10 2019/01/14 13:34:26 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -309,9 +309,9 @@ cpu_coredump32(struct lwp *l, struct cor
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask));
-MODULE_CALL_HOOK(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
netbsd32_sendsig_siginfo(ksi, mask));
Index: src/sys/arch/mips/mips/netbsd32_machdep_16.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.8 src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.9
--- src/sys/arch/mips/mips/netbsd32_machdep_16.c:1.1.2.8 Sat Sep 29 10:18:29 2018
+++ src/sys/arch/mips/mips/netbsd32_machdep_16.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.8 2018/09/29 10:18:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2019/01/14 13:34:26 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.8 2018/09/29 10:18:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2019/01/14 13:34:26 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
#include <uvm/uvm_extern.h>
-int netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
+void netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
void sendsig_context(const ksiginfo_t *, const sigset_t *);
int netbsd32_sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
@@ -86,15 +86,13 @@ compat_16_netbsd32___sigreturn14(struct
return compat_16_sys___sigreturn14(l, &ua, retval);
}
-int
+void
netbsd32_sendsig_16(const ksiginfo_t *ksi, const sigset_t *mask)
{
if (curproc->p_sigacts->sa_sigdesc[ksi->ksi_signo].sd_vers < 2)
sendsig_sigcontext(ksi, mask);
else
netbsd32_sendsig_siginfo(ksi, mask);
-
- return 0;
}
MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
Index: src/sys/arch/sparc/fpu/fpu.c
diff -u src/sys/arch/sparc/fpu/fpu.c:1.27.46.2 src/sys/arch/sparc/fpu/fpu.c:1.27.46.3
--- src/sys/arch/sparc/fpu/fpu.c:1.27.46.2 Sun Jan 13 10:49:49 2019
+++ src/sys/arch/sparc/fpu/fpu.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.27.46.2 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.2 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -122,8 +122,8 @@ static u_char fpu_codes_sunos[] = {
/*
* HOOK for checking if the lwp's emul matches sunos
*/
-MODULE_CALL_HOOK_DECL(get_emul_sunos_hook, (const struct emul **emul));
-MODULE_CALL_HOOK(get_emul_sunos_hook, (const struct emul ** emul), (emul),
+MODULE_CALL_INT_HOOK_DECL(get_emul_sunos_hook, (const struct emul **emul));
+MODULE_CALL_INT_HOOK(get_emul_sunos_hook, (const struct emul ** emul), (emul),
enosys());
/*
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.2 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.3
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.2 Sun Jan 13 10:49:49 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.110.14.2 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.110.14.3 2019/01/14 13:34:26 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.110.14.2 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.3 2019/01/14 13:34:26 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -262,9 +262,9 @@ netbsd32_sendsig_siginfo(const ksiginfo_
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask));
-MODULE_CALL_HOOK(netbsd32_sendsig_hook,
+MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
netbsd32_sendsig_siginfo(ksi, mask));
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.4 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.5
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.4 Tue Jan 1 05:38:34 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Mon Jan 14 13:34:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2019/01/14 13:34:26 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2019/01/14 13:34:26 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
void netbsd32_sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
-int netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
+void netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *);
/*
* NB: since this is a 32-bit address world, sf_scp and sf_sc
@@ -245,15 +245,13 @@ struct sparc32_sigframe_siginfo {
ucontext32_t sf_uc;
};
-int
+void
netbsd32_sendsig_16(const ksiginfo_t *ksi, const sigset_t *mask)
{
if (curproc->p_sigacts->sa_sigdesc[ksi->ksi_signo].sd_vers < 2)
netbsd32_sendsig_sigcontext(ksi, mask);
else
netbsd32_sendsig_siginfo(ksi, mask);
-
- return 0;
}
#undef DEBUG
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.11 src/sys/compat/common/if_43.c:1.14.2.12
--- src/sys/compat/common/if_43.c:1.14.2.11 Sun Jan 13 10:49:49 2019
+++ src/sys/compat/common/if_43.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.11 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.12 2019/01/14 13:34:27 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.11 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.12 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
* XXX The if43_20 routine doesn't really have any effect, since its
* XXX return value is ignored (see compat/common/if_43.c)!
*/
-MODULE_CALL_HOOK_DECL(if43_20_hook, (u_long ncmd));
-MODULE_CALL_HOOK(if43_20_hook, (u_long ncmd), (ncmd), enosys());
+MODULE_CALL_INT_HOOK_DECL(if43_20_hook, (u_long ncmd));
+MODULE_CALL_INT_HOOK(if43_20_hook, (u_long ncmd), (ncmd), enosys());
/*
* Use a wrapper so that the compat_cvtcmd() can return a u_long
Index: src/sys/compat/common/rtsock_14.c
diff -u src/sys/compat/common/rtsock_14.c:1.5.14.5 src/sys/compat/common/rtsock_14.c:1.5.14.6
--- src/sys/compat/common/rtsock_14.c:1.5.14.5 Sun Jan 13 10:49:49 2019
+++ src/sys/compat/common/rtsock_14.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_14.c,v 1.5.14.5 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: rtsock_14.c,v 1.5.14.6 2019/01/14 13:34:27 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.5 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.5.14.6 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -95,7 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,
#include <compat/common/compat_mod.h>
-int
+void
compat_14_rt_oifmsg(struct ifnet *ifp)
{
struct if_msghdr14 oifm;
@@ -104,7 +104,7 @@ compat_14_rt_oifmsg(struct ifnet *ifp)
struct timeval tv;
if (compat_50_route_info.ri_cb.any_count == 0)
- return 0;
+ return;
(void)memset(&info, 0, sizeof(info));
(void)memset(&oifm, 0, sizeof(oifm));
oifm.ifm_index = ifp->if_index;
@@ -131,9 +131,8 @@ compat_14_rt_oifmsg(struct ifnet *ifp)
oifm.ifm_addrs = 0;
m = compat_50_rt_msg1(RTM_OOIFINFO, &info, (void *)&oifm, sizeof(oifm));
if (m == NULL)
- return 0;
+ return;
compat_50_route_enqueue(m, 0);
- return 0;
}
int
Index: src/sys/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.6.2.3 src/sys/compat/common/rtsock_50.c:1.6.2.4
--- src/sys/compat/common/rtsock_50.c:1.6.2.3 Sun Jan 13 23:32:21 2019
+++ src/sys/compat/common/rtsock_50.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.6.2.3 2019/01/13 23:32:21 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.6.2.4 2019/01/14 13:34:27 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6.2.3 2019/01/13 23:32:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6.2.4 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,
#include <net/rtsock.c>
#include <compat/net/route_50.h>
-int
+void
compat_50_rt_oifmsg(struct ifnet *ifp)
{
struct if_msghdr50 oifm;
@@ -88,7 +88,7 @@ compat_50_rt_oifmsg(struct ifnet *ifp)
struct rt_addrinfo info;
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
(void)memset(&info, 0, sizeof(info));
(void)memset(&oifm, 0, sizeof(oifm));
oifm.ifm_index = ifp->if_index;
@@ -116,10 +116,8 @@ compat_50_rt_oifmsg(struct ifnet *ifp)
oifm.ifm_addrs = 0;
m = COMPATNAME(rt_msg1)(RTM_OIFINFO, &info, (void *)&oifm, sizeof(oifm));
if (m == NULL)
- return 0;
+ return;
COMPATNAME(route_enqueue)(m, 0);
-
- return 0;
}
int
Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.2.2.3 src/sys/compat/common/rtsock_70.c:1.2.2.4
--- src/sys/compat/common/rtsock_70.c:1.2.2.3 Sun Jan 13 10:49:49 2019
+++ src/sys/compat/common/rtsock_70.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_70.c,v 1.2.2.3 2019/01/13 10:49:49 pgoyette Exp $ */
+/* $NetBSD: rtsock_70.c,v 1.2.2.4 2019/01/14 13:34:27 pgoyette Exp $ */
/*
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2.2.3 2019/01/13 10:49:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2.2.4 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,
#include <compat/net/route.h>
#include <compat/net/route_70.h>
-int
+void
compat_70_rt_newaddrmsg1(int cmd, struct ifaddr *ifa)
{
struct rt_addrinfo info;
@@ -87,12 +87,10 @@ compat_70_rt_newaddrmsg1(int cmd, struct
m = rt_msg1(ncmd, &info, &ifam, sizeof(ifam));
if (m == NULL)
- return 0;
+ return;
mtod(m, struct ifa_msghdr70 *)->ifam_addrs = info.rti_addrs;
route_enqueue(m, sa ? sa->sa_family : 0);
-
- return 0;
}
int
Index: src/sys/compat/common/sysmon_power_40.c
diff -u src/sys/compat/common/sysmon_power_40.c:1.1.2.4 src/sys/compat/common/sysmon_power_40.c:1.1.2.5
--- src/sys/compat/common/sysmon_power_40.c:1.1.2.4 Sat Sep 22 04:56:28 2018
+++ src/sys/compat/common/sysmon_power_40.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power_40.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: sysmon_power_40.c,v 1.1.2.5 2019/01/14 13:34:27 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.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.5 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -77,20 +77,19 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_power
#include <compat/common/compat_mod.h>
-static int
+static void
compat_40_sysmon_power(power_event_t *pev, struct sysmon_pswitch *pswitch,
int event)
{
- pev->pev_switch.psws_state = event;
- pev->pev_switch.psws_type = pswitch->smpsw_type;
+ pev->pev_switch.psws_state = event;
+ pev->pev_switch.psws_type = pswitch->smpsw_type;
- if (pswitch->smpsw_name) {
- (void)strlcpy(pev->pev_switch.psws_name,
- pswitch->smpsw_name,
- sizeof(pev->pev_switch.psws_name));
- }
- return 0;
+ if (pswitch->smpsw_name) {
+ (void)strlcpy(pev->pev_switch.psws_name,
+ pswitch->smpsw_name,
+ sizeof(pev->pev_switch.psws_name));
+ }
}
MODULE_SET_HOOK(compat_sysmon_power_40_hook, "smon60", compat_40_sysmon_power);
Index: src/sys/compat/common/uipc_usrreq_70.c
diff -u src/sys/compat/common/uipc_usrreq_70.c:1.1.20.3 src/sys/compat/common/uipc_usrreq_70.c:1.1.20.4
--- src/sys/compat/common/uipc_usrreq_70.c:1.1.20.3 Mon Oct 15 11:57:05 2018
+++ src/sys/compat/common/uipc_usrreq_70.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.3 2018/10/15 11:57:05 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.4 2019/01/14 13:34:27 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.3 2018/10/15 11:57:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.4 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,8 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_
#include <compat/sys/socket.h>
-int
-compat_70_unp_addsockcred(struct mbuf **ret, struct lwp *l, struct mbuf *control)
+void
+compat_70_unp_addsockcred(struct mbuf **ret, struct lwp *l,
+ struct mbuf *control)
{
struct sockcred70 *sc;
struct mbuf *m;
@@ -58,7 +59,7 @@ compat_70_unp_addsockcred(struct mbuf **
SCM_OCREDS, SOL_SOCKET, M_WAITOK);
if (m == NULL) {
*ret = control;
- return 0;
+ return;
}
sc = p;
@@ -72,7 +73,6 @@ compat_70_unp_addsockcred(struct mbuf **
sc->sc_groups[i] = kauth_cred_group(l->l_cred, i);
*ret = m_add(control, m);
- return 0;
}
MODULE_SET_HOOK(compat_70_unp_hook, "unp_70", compat_70_unp_addsockcred);
Index: src/sys/compat/net/if.h
diff -u src/sys/compat/net/if.h:1.4.14.2 src/sys/compat/net/if.h:1.4.14.3
--- src/sys/compat/net/if.h:1.4.14.2 Sun Jan 13 23:32:21 2019
+++ src/sys/compat/net/if.h Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.4.14.2 2019/01/13 23:32:21 pgoyette Exp $ */
+/* $NetBSD: if.h,v 1.4.14.3 2019/01/14 13:34:27 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@ struct if_msghdr14 {
struct if_data14 ifm_data; /* statistics and other data about if */
};
-int compat_14_rt_oifmsg(struct ifnet *);
+void compat_14_rt_oifmsg(struct ifnet *);
int compat_14_iflist(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *,
size_t);
@@ -153,7 +153,7 @@ struct if_msghdr50 {
struct if_data50 ifm_data;/* statistics and other data about if */
};
-int compat_50_rt_oifmsg(struct ifnet *);
+void compat_50_rt_oifmsg(struct ifnet *);
int compat_50_iflist(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *,
size_t);
Index: src/sys/compat/net/route.h
diff -u src/sys/compat/net/route.h:1.2.14.2 src/sys/compat/net/route.h:1.2.14.3
--- src/sys/compat/net/route.h:1.2.14.2 Sun Jan 13 23:32:21 2019
+++ src/sys/compat/net/route.h Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.2.14.2 2019/01/13 23:32:21 pgoyette Exp $ */
+/* $NetBSD: route.h,v 1.2.14.3 2019/01/14 13:34:27 pgoyette Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -81,14 +81,14 @@ struct rt_msghdr50 {
#ifdef _KERNEL
extern struct route_info compat_50_route_info;
void compat_50_route_enqueue(struct mbuf *, int);
-int compat_50_rt_ifannouncemsg(struct ifnet *, int);
-int compat_50_rt_ieee80211msg(struct ifnet *, int, void *, size_t);
-int compat_50_rt_ifmsg(struct ifnet *);
-int compat_50_rt_missmsg(int, const struct rt_addrinfo *, int, int);
+void compat_50_rt_ifannouncemsg(struct ifnet *, int);
+void compat_50_rt_ieee80211msg(struct ifnet *, int, void *, size_t);
+void compat_50_rt_ifmsg(struct ifnet *);
+void compat_50_rt_missmsg(int, const struct rt_addrinfo *, int, int);
struct mbuf *
compat_50_rt_msg1(int, struct rt_addrinfo *, void *, int);
-int compat_50_rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
-int compat_70_rt_newaddrmsg1(int, struct ifaddr *);
+void compat_50_rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
+void compat_70_rt_newaddrmsg1(int, struct ifaddr *);
#endif
#define RTM_OVERSION 3 /* Up the ante and ignore older versions */
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.16 src/sys/compat/netbsd32/netbsd32.h:1.116.2.17
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.16 Mon Nov 26 01:52:29 2018
+++ src/sys/compat/netbsd32/netbsd32.h Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.16 2018/11/26 01:52:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.17 2019/01/14 13:34:27 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1174,7 +1174,8 @@ struct iovec *netbsd32_get_iov(struct ne
SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup);
#endif /* SYSCTL_SETUP_PROTO */
-MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *));
+MODULE_HOOK(netbsd32_sendsig_hook, void,
+ (const ksiginfo_t *, const sigset_t *));
extern struct sysent netbsd32_sysent[];
extern const uint32_t netbsd32_sysent_nomodbits[];
@@ -1185,7 +1186,7 @@ extern const char * const netbsd32_sysca
extern struct sysctlnode netbsd32_sysctl_root;
struct netbsd32_modctl_args;
-MODULE_HOOK(compat32_80_modctl_hook,
+MODULE_HOOK(compat32_80_modctl_hook, int,
(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
/*
Index: src/sys/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.5 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.6
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.5 Sun Jan 13 10:49:50 2019
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.5 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.6 2019/01/14 13:34:27 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.5 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.6 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -124,7 +124,7 @@ copyin_psstrings_32(struct proc *p, stru
return 0;
}
-static int
+static void
get_base32(char **argv, size_t i, vaddr_t *base)
{
@@ -132,8 +132,6 @@ get_base32(char **argv, size_t i, vaddr_
argv32 = (netbsd32_charp *)argv;
*base = (vaddr_t)NETBSD32PTR64(argv32[i]);
-
- return 0;
}
#if !defined(_RUMPSERVER)
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.10 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.11
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.10 Sun Jan 13 10:49:50 2019
+++ src/sys/compat/netbsd32/netbsd32_module.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.10 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.11 2019/01/14 13:34:27 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.10 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.11 2019/01/14 13:34:27 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -201,10 +201,10 @@ compat32_80_modctl_compat_stub(struct lw
}
/* Module hook for netbsd32_80_modctl */
-MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook,
+MODULE_CALL_INT_HOOK_DECL(compat32_80_modctl_hook,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result));
-MODULE_CALL_HOOK(compat32_80_modctl_hook,
+MODULE_CALL_INT_HOOK(compat32_80_modctl_hook,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result),
(lwp, uap, result),
Index: src/sys/compat/sys/socket.h
diff -u src/sys/compat/sys/socket.h:1.15.2.2 src/sys/compat/sys/socket.h:1.15.2.3
--- src/sys/compat/sys/socket.h:1.15.2.2 Wed Dec 26 14:01:47 2018
+++ src/sys/compat/sys/socket.h Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.15.2.2 2018/12/26 14:01:47 pgoyette Exp $ */
+/* $NetBSD: socket.h,v 1.15.2.3 2019/01/14 13:34:27 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -104,7 +104,7 @@ u_long compat_cvtcmd(u_long cmd);
int compat_ifioctl(struct socket *, u_long, u_long, void *, struct lwp *);
int compat43_set_accrights(struct msghdr *, void *, int);
-int compat_70_unp_addsockcred(struct mbuf **, struct lwp *, struct mbuf *);
+void compat_70_unp_addsockcred(struct mbuf **, struct lwp *, struct mbuf *);
void uipc_usrreq_70_init(void);
void uipc_usrreq_70_fini(void);
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.13.16.6 src/sys/dev/bio.c:1.13.16.7
--- src/sys/dev/bio.c:1.13.16.6 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/bio.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.13.16.6 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.13.16.7 2019/01/14 13:34:27 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.6 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.7 2019/01/14 13:34:27 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -115,9 +115,9 @@ bioclose(dev_t dev, int flags, int mode,
}
/* Hook up the compat_bio_30 routine */
-MODULE_CALL_HOOK_DECL(compat_bio_30_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_bio_30_hook,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)));
-MODULE_CALL_HOOK(compat_bio_30_hook,
+MODULE_CALL_INT_HOOK(compat_bio_30_hook,
(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.9 src/sys/dev/ccd.c:1.175.2.10
--- src/sys/dev/ccd.c:1.175.2.9 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/ccd.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.175.2.9 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.175.2.10 2019/01/14 13:34:27 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.9 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.10 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1061,10 +1061,10 @@ 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.
*/
-MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, (dev_t dev, u_long cmd, void *data,
+MODULE_CALL_INT_HOOK_DECL(ccd_ioctl_60_hook, (dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
struct lwp *)));
-MODULE_CALL_HOOK(ccd_ioctl_60_hook, (dev_t dev, u_long cmd, void *data,
+MODULE_CALL_INT_HOOK(ccd_ioctl_60_hook, (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.9 src/sys/dev/clockctl.c:1.35.14.10
--- src/sys/dev/clockctl.c:1.35.14.9 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/clockctl.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.9 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.10 2019/01/14 13:34:27 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.9 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.10 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -201,9 +201,9 @@ clockctl_modcmd(modcmd_t cmd, void *data
}
/* Hook the compat_50 stuff */
-MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook,
+MODULE_CALL_INT_HOOK_DECL(clockctl_ioctl_50_hook,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l));
-MODULE_CALL_HOOK(clockctl_ioctl_50_hook,
+MODULE_CALL_INT_HOOK(clockctl_ioctl_50_hook,
(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.11 src/sys/dev/vnd.c:1.263.2.12
--- src/sys/dev/vnd.c:1.263.2.11 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/vnd.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.263.2.11 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.263.2.12 2019/01/14 13:34:27 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.11 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.12 2019/01/14 13:34:27 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1126,19 +1126,19 @@ vndioctl_get(struct lwp *l, void *data,
}
}
-MODULE_CALL_HOOK_DECL(compat_vndioctl_30_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_vndioctl_30_hook,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)));
-MODULE_CALL_HOOK(compat_vndioctl_30_hook,
+MODULE_CALL_INT_HOOK(compat_vndioctl_30_hook,
(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());
-MODULE_CALL_HOOK_DECL(compat_vndioctl_50_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_vndioctl_50_hook,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)));
-MODULE_CALL_HOOK(compat_vndioctl_50_hook,
+MODULE_CALL_INT_HOOK(compat_vndioctl_50_hook,
(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_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.7 src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.8
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.7 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.8 2019/01/14 13:34:27 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.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.8 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1038,19 +1038,19 @@ raid_detach_unlocked(struct raid_softc *
}
/* Hooks to call the 5.0 and 8.0 ioctl compat code */
-MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook,
+MODULE_CALL_INT_HOOK_DECL(raidframe50_ioctl_hook,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_HOOK(raidframe50_ioctl_hook,
+MODULE_CALL_INT_HOOK(raidframe50_ioctl_hook,
(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());
-MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook,
+MODULE_CALL_INT_HOOK_DECL(raidframe80_ioctl_hook,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_HOOK(raidframe80_ioctl_hook,
+MODULE_CALL_INT_HOOK(raidframe80_ioctl_hook,
(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.6 src/sys/dev/sysmon/sysmon_power.c:1.58.2.7
--- src/sys/dev/sysmon/sysmon_power.c:1.58.2.6 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/sysmon/sysmon_power.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.58.2.6 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.58.2.7 2019/01/14 13:34:27 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.6 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.7 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -318,11 +318,11 @@ sysmon_power_event_queue_flush(void)
/*
* Call the compat hook function
*/
-MODULE_CALL_HOOK_DECL(compat_sysmon_power_40_hook,
+MODULE_CALL_VOID_HOOK_DECL(compat_sysmon_power_40_hook,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event));
-MODULE_CALL_HOOK(compat_sysmon_power_40_hook,
+MODULE_CALL_VOID_HOOK(compat_sysmon_power_40_hook,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
- (pev, pswitch, event), enosys());
+ (pev, pswitch, event), __nothing);
/*
* sysmon_power_daemon_task:
@@ -355,7 +355,7 @@ sysmon_power_daemon_task(struct power_ev
pev.pev_type = POWER_EVENT_SWITCH_STATE_CHANGE;
- (void)compat_sysmon_power_40_hook_call(&pev, pswitch, event);
+ compat_sysmon_power_40_hook_call(&pev, pswitch, event);
error = sysmon_power_make_dictionary(ped->dict,
pswitch,
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.139.2.7 src/sys/dev/usb/ugen.c:1.139.2.8
--- src/sys/dev/usb/ugen.c:1.139.2.7 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/usb/ugen.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.139.2.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: ugen.c,v 1.139.2.8 2019/01/14 13:34:27 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.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.8 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1439,10 +1439,10 @@ ugen_get_alt_index(struct ugen_softc *sc
return usbd_get_interface_altindex(iface);
}
-MODULE_CALL_HOOK_DECL(usb_subr_30_fill_hook,
- (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)));
+MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_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)));
Static int
ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.101.2.6 src/sys/dev/usb/uhid.c:1.101.2.7
--- src/sys/dev/usb/uhid.c:1.101.2.6 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/usb/uhid.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.101.2.6 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: uhid.c,v 1.101.2.7 2019/01/14 13:34:27 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.6 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.7 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -513,10 +513,10 @@ uhidwrite(dev_t dev, struct uio *uio, in
return error;
}
-MODULE_CALL_HOOK_DECL(usb_subr_30_fill_hook,
- (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)));
+MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_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)));
int
uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, void *addr,
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.168.2.8 src/sys/dev/usb/usb.c:1.168.2.9
--- src/sys/dev/usb/usb.c:1.168.2.8 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/usb/usb.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.168.2.8 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: usb.c,v 1.168.2.9 2019/01/14 13:34:27 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.8 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.9 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -657,9 +657,9 @@ usbopen(dev_t dev, int flag, int mode, s
}
/* Call the hook for usb30_copy_to_old() */
-MODULE_CALL_HOOK_DECL(usb_subr_30_copy_hook,
+MODULE_CALL_INT_HOOK_DECL(usb_subr_30_copy_hook,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio));
-MODULE_CALL_HOOK(usb_subr_30_copy_hook,
+MODULE_CALL_INT_HOOK(usb_subr_30_copy_hook,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
(ue, ueo, uio), enosys());
@@ -736,14 +736,15 @@ usbclose(dev_t dev, int flag, int mode,
}
/* Call hook for usbd30_fill_device_info_old() */
-MODULE_CALL_HOOK_DECL(usb_subr_30_fill_hook,
+MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_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)));
+MODULE_CALL_INT_HOOK(usb_subr_30_fill_hook,
(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)));
-MODULE_CALL_HOOK(usb_subr_30_fill_hook,
- (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)),
+ size_t, int, int),
+ int (*printBCD)(char *, size_t, int)),
(udev, addr, usedev, fill_devinfo_vp, printBCD),
enosys());
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.37.2.7 src/sys/dev/wscons/wsevent.c:1.37.2.8
--- src/sys/dev/wscons/wsevent.c:1.37.2.7 Sun Jan 13 10:49:50 2019
+++ src/sys/dev/wscons/wsevent.c Mon Jan 14 13:34:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.37.2.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.37.2.8 2019/01/14 13:34:27 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.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.8 2019/01/14 13:34:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -189,9 +189,9 @@ wsevent_fini(struct wseventvar *ev)
softint_disestablish(ev->sih);
}
-MODULE_CALL_HOOK_DECL(wsevent_50_copyout_events_hook,
+MODULE_CALL_INT_HOOK_DECL(wsevent_50_copyout_events_hook,
(const struct wscons_event *events, int cnt, struct uio *uio));
-MODULE_CALL_HOOK(wsevent_50_copyout_events_hook,
+MODULE_CALL_INT_HOOK(wsevent_50_copyout_events_hook,
(const struct wscons_event *events, int cnt, struct uio *uio),
(events, cnt, uio), enosys());
Index: src/sys/fs/puffs/puffs_compat.c
diff -u src/sys/fs/puffs/puffs_compat.c:1.4.16.4 src/sys/fs/puffs/puffs_compat.c:1.4.16.5
--- src/sys/fs/puffs/puffs_compat.c:1.4.16.4 Sun Jan 13 10:49:50 2019
+++ src/sys/fs/puffs/puffs_compat.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_compat.c,v 1.4.16.4 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: puffs_compat.c,v 1.4.16.5 2019/01/14 13:34:28 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.4 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.4.16.5 2019/01/14 13:34:28 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -343,7 +343,7 @@ puffs_compat_outgoing(struct puffs_req *
#define ASSIGN(field) \
omsg->field = cmsg->field;
-int
+void
puffs_compat_incoming(struct puffs_req *preq, struct puffs_req *creq)
{
@@ -434,7 +434,6 @@ puffs_compat_incoming(struct puffs_req *
panic("puffs compat ops come in pairs");
}
}
- return 0;
}
MODULE_SET_HOOK(puffs_50_out_hook, "pffs50", puffs_compat_outgoing);
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.101.10.7 src/sys/fs/puffs/puffs_msgif.c:1.101.10.8
--- src/sys/fs/puffs/puffs_msgif.c:1.101.10.7 Sun Jan 13 10:49:50 2019
+++ src/sys/fs/puffs/puffs_msgif.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.101.10.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.101.10.8 2019/01/14 13:34:28 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.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.8 2019/01/14 13:34:28 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 */
-MODULE_CALL_HOOK_DECL(puffs_50_out_hook,
+MODULE_CALL_INT_HOOK_DECL(puffs_50_out_hook,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap));
-MODULE_CALL_HOOK(puffs_50_out_hook,
+MODULE_CALL_INT_HOOK(puffs_50_out_hook,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
(oreq, creqp, deltap), enosys());
/* Incoming */
-MODULE_CALL_HOOK_DECL(puffs_50_in_hook,
+MODULE_CALL_VOID_HOOK_DECL(puffs_50_in_hook,
(struct puffs_req *oreq, struct puffs_req *creqp));
-MODULE_CALL_HOOK(puffs_50_in_hook,
+MODULE_CALL_VOID_HOOK(puffs_50_in_hook,
(struct puffs_req *oreq, struct puffs_req *creqp),
- (oreq, creqp), enosys());
+ (oreq, creqp), __nothing);
/*
* A word about reference counting of parks. A reference must be taken
@@ -822,8 +822,7 @@ puffsop_msg(void *ctx, struct puffs_req
size_t csize;
KASSERT(pmp->pmp_docompat);
- (void)puffs_50_in_hook_call(preq,
- park->park_creq);
+ puffs_50_in_hook_call(preq, park->park_creq);
creq = park->park_creq;
csize = park->park_creqlen;
park->park_creq = park->park_preq;
Index: src/sys/fs/puffs/puffs_sys.h
diff -u src/sys/fs/puffs/puffs_sys.h:1.90.16.2 src/sys/fs/puffs/puffs_sys.h:1.90.16.3
--- src/sys/fs/puffs/puffs_sys.h:1.90.16.2 Mon Sep 17 11:04:31 2018
+++ src/sys/fs/puffs/puffs_sys.h Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_sys.h,v 1.90.16.2 2018/09/17 11:04:31 pgoyette Exp $ */
+/* $NetBSD: puffs_sys.h,v 1.90.16.3 2019/01/14 13:34:28 pgoyette Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -291,7 +291,7 @@ void puffs_senderr(struct puffs_mount *,
puffs_cookie_t);
int puffs_compat_outgoing(struct puffs_req *, struct puffs_req**, ssize_t*);
-int puffs_compat_incoming(struct puffs_req *, struct puffs_req *);
+void puffs_compat_incoming(struct puffs_req *, struct puffs_req *);
void puffs_updatenode(struct puffs_node *, int, voff_t);
#define PUFFS_UPDATEATIME 0x01
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.11 src/sys/kern/kern_proc.c:1.209.2.12
--- src/sys/kern/kern_proc.c:1.209.2.11 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/kern_proc.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.209.2.11 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: kern_proc.c,v 1.209.2.12 2019/01/14 13:34:28 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.11 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.12 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1896,15 +1896,15 @@ sysctl_doeproc(SYSCTLFN_ARGS)
* compat_netbsd32 hooks
*/
#if !defined(_RUMPKERNEL)
-MODULE_CALL_HOOK_DECL(kern_proc_32_copyin_hook,
+MODULE_CALL_INT_HOOK_DECL(kern_proc_32_copyin_hook,
(struct proc *p, struct ps_strings *s));
-MODULE_CALL_HOOK(kern_proc_32_copyin_hook,
+MODULE_CALL_INT_HOOK(kern_proc_32_copyin_hook,
(struct proc *p, struct ps_strings *s), (p, s), enosys());
-MODULE_CALL_HOOK_DECL(kern_proc_32_base_hook,
+MODULE_CALL_VOID_HOOK_DECL(kern_proc_32_base_hook,
(char **argv, size_t i, vaddr_t *base));
-MODULE_CALL_HOOK(kern_proc_32_base_hook,
- (char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
+MODULE_CALL_VOID_HOOK(kern_proc_32_base_hook,
+ (char **argv, size_t i, vaddr_t *base), (argv, i, base), __nothing);
#endif /* !defined(_RUMPKERNEL) */
int
@@ -2126,7 +2126,7 @@ copy_procargs(struct proc *p, int oid, s
#if !defined(_RUMPKERNEL)
if (p->p_flag & PK_32)
- (void)kern_proc_32_base_hook_call(argv, i++, &base);
+ kern_proc_32_base_hook_call(argv, i++, &base);
else
#endif /* !defined(_RUMPKERNEL) */
base = (vaddr_t)argv[i++];
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.89.16.5 src/sys/kern/kern_rndq.c:1.89.16.6
--- src/sys/kern/kern_rndq.c:1.89.16.5 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/kern_rndq.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.89.16.5 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.89.16.6 2019/01/14 13:34:28 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.89.16.5 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.89.16.6 2019/01/14 13:34:28 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1446,12 +1446,13 @@ krs_setflags(krndsource_t *kr, uint32_t
}
}
-MODULE_CALL_HOOK_DECL(rnd_ioctl_50_hook, (struct file *, u_long, void *));
-MODULE_CALL_HOOK_DECL(rnd_ioctl_50_32_hook, (struct file *, u_long, void *));
+MODULE_CALL_INT_HOOK_DECL(rnd_ioctl_50_hook, (struct file *, u_long, void *));
+MODULE_CALL_INT_HOOK_DECL(rnd_ioctl_50_32_hook,
+ (struct file *, u_long, void *));
-MODULE_CALL_HOOK(rnd_ioctl_50_hook,
+MODULE_CALL_INT_HOOK(rnd_ioctl_50_hook,
(struct file *fp, u_long cmd, void *addr), (fp, cmd, addr), enosys());
-MODULE_CALL_HOOK(rnd_ioctl_50_32_hook,
+MODULE_CALL_INT_HOOK(rnd_ioctl_50_32_hook,
(struct file *fp, u_long cmd, void *addr), (fp, cmd, addr), enosys());
int
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.23.2.14 src/sys/kern/sys_module.c:1.23.2.15
--- src/sys/kern/sys_module.c:1.23.2.14 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/sys_module.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.23.2.14 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: sys_module.c,v 1.23.2.15 2019/01/14 13:34:28 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.14 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.15 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -262,9 +262,9 @@ handle_modctl_stat(struct iovec *iov, vo
}
/* MODULE_HOOK glue for modstat_80 */
-MODULE_CALL_HOOK_DECL(compat_modstat_80_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_modstat_80_hook,
(int cmd, struct iovec *iov, void *arg));
-MODULE_CALL_HOOK(compat_modstat_80_hook,
+MODULE_CALL_INT_HOOK(compat_modstat_80_hook,
(int cmd, struct iovec *iov, void *arg), (cmd, iov, arg), enosys());
int
Index: src/sys/kern/sysv_ipc.c
diff -u src/sys/kern/sysv_ipc.c:1.32.16.7 src/sys/kern/sysv_ipc.c:1.32.16.8
--- src/sys/kern/sysv_ipc.c:1.32.16.7 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/sysv_ipc.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_ipc.c,v 1.32.16.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: sysv_ipc.c,v 1.32.16.8 2019/01/14 13:34:28 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.32.16.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.32.16.8 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -347,8 +347,8 @@ stub_sysvipc50_sysctl(SYSCTLFN_ARGS)
return EPASSTHROUGH;
}
-MODULE_CALL_HOOK_DECL(sysvipc50_sysctl_hook, (SYSCTLFN_PROTO));
-MODULE_CALL_HOOK(sysvipc50_sysctl_hook, (SYSCTLFN_ARGS),
+MODULE_CALL_INT_HOOK_DECL(sysvipc50_sysctl_hook, (SYSCTLFN_PROTO));
+MODULE_CALL_INT_HOOK(sysvipc50_sysctl_hook, (SYSCTLFN_ARGS),
(SYSCTLFN_CALL(rnode)), stub_sysvipc50_sysctl(SYSCTLFN_CALL(rnode)));
static int
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.275.2.6 src/sys/kern/tty.c:1.275.2.7
--- src/sys/kern/tty.c:1.275.2.6 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/tty.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.275.2.6 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: tty.c,v 1.275.2.7 2019/01/14 13:34:28 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.275.2.6 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.275.2.7 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -921,9 +921,9 @@ ttyoutput(int c, struct tty *tp)
/*
* MODULE_HOOK glue for compat_60_ttioctl
*/
-MODULE_CALL_HOOK_DECL(compat_60_ttioctl_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_60_ttioctl_hook,
(dev_t, u_long, void *, int, struct lwp *));
-MODULE_CALL_HOOK(compat_60_ttioctl_hook,
+MODULE_CALL_INT_HOOK(compat_60_ttioctl_hook,
(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l),
(dev, cmd, data, flag, l), enosys());
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.37.16.3 src/sys/kern/tty_ptm.c:1.37.16.4
--- src/sys/kern/tty_ptm.c:1.37.16.3 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/tty_ptm.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.37.16.3 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37.16.4 2019/01/14 13:34:28 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.37.16.3 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.16.4 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -385,9 +385,9 @@ stub_compat_ptmioctl_60(dev_t dev, u_lon
return EPASSTHROUGH;
}
-MODULE_CALL_HOOK_DECL(compat_60_ptmioctl_hook,
+MODULE_CALL_INT_HOOK_DECL(compat_60_ptmioctl_hook,
(dev_t, u_long, void *, int, struct lwp *));
-MODULE_CALL_HOOK(compat_60_ptmioctl_hook,
+MODULE_CALL_INT_HOOK(compat_60_ptmioctl_hook,
(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l),
(dev, cmd, data, flag, l), enosys());
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.183.2.7 src/sys/kern/uipc_usrreq.c:1.183.2.8
--- src/sys/kern/uipc_usrreq.c:1.183.2.7 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/uipc_usrreq.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.183.2.7 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.183.2.8 2019/01/14 13:34:28 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.183.2.7 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.183.2.8 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -198,15 +198,14 @@ static int unp_defer;
/* Compat interface */
-int stub_compat_70_unp_addsockcred(struct mbuf **, lwp_t *, struct mbuf *);
+void stub_compat_70_unp_addsockcred(struct mbuf **, lwp_t *, struct mbuf *);
-int stub_compat_70_unp_addsockcred(struct mbuf** ret, struct lwp *lwp,
+void stub_compat_70_unp_addsockcred(struct mbuf** ret, struct lwp *lwp,
struct mbuf *control)
{
- /* just return our initial argument */
+/* just copy our initial argument */
*ret = control;
- return 0;
}
bool *compat70_ocreds_valid = false;
@@ -331,9 +330,9 @@ unp_free(struct unpcb *unp)
kmem_free(unp, sizeof(*unp));
}
-MODULE_CALL_HOOK_DECL(compat_70_unp_hook,
+MODULE_CALL_VOID_HOOK_DECL(compat_70_unp_hook,
(struct mbuf **, struct lwp *, struct mbuf *));
-MODULE_CALL_HOOK(compat_70_unp_hook,
+MODULE_CALL_VOID_HOOK(compat_70_unp_hook,
(struct mbuf **ret, struct lwp *lwp, struct mbuf *control),
(ret, lwp, control), stub_compat_70_unp_addsockcred(ret, lwp, control));
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.518.2.3 src/sys/kern/vfs_syscalls.c:1.518.2.4
--- src/sys/kern/vfs_syscalls.c:1.518.2.3 Sun Jan 13 10:49:50 2019
+++ src/sys/kern/vfs_syscalls.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.518.2.3 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.518.2.4 2019/01/14 13:34:28 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.518.2.3 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.518.2.4 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1635,8 +1635,8 @@ stub_sys_openat_10(struct pathbuf **pb)
return 0;
}
-MODULE_CALL_HOOK_DECL(compat_10_openat_hook, (struct pathbuf **));
-MODULE_CALL_HOOK(compat_10_openat_hook, (struct pathbuf **pb), (pb),
+MODULE_CALL_INT_HOOK_DECL(compat_10_openat_hook, (struct pathbuf **));
+MODULE_CALL_INT_HOOK(compat_10_openat_hook, (struct pathbuf **pb), (pb),
stub_sys_openat_10(pb));
static int
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.419.2.19 src/sys/net/if.c:1.419.2.20
--- src/sys/net/if.c:1.419.2.19 Sun Jan 13 10:49:50 2019
+++ src/sys/net/if.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.419.2.19 2019/01/13 10:49:50 pgoyette Exp $ */
+/* $NetBSD: if.c,v 1.419.2.20 2019/01/14 13:34:28 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.19 2019/01/13 10:49:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.20 2019/01/14 13:34:28 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3120,24 +3120,24 @@ out:
/*
* Interface for calling the compat routines
*/
-MODULE_CALL_HOOK_DECL(uipc_syscalls_40_hook,
+MODULE_CALL_INT_HOOK_DECL(uipc_syscalls_40_hook,
(struct lwp *l, int cmd, void *data));
-MODULE_CALL_HOOK(uipc_syscalls_40_hook,
+MODULE_CALL_INT_HOOK(uipc_syscalls_40_hook,
(struct lwp *l, int cmd, void *data), (cmd, data), enosys());
-MODULE_CALL_HOOK_DECL(uipc_syscalls_50_hook,
+MODULE_CALL_INT_HOOK_DECL(uipc_syscalls_50_hook,
(struct lwp *l, int cmd, void *data));
-MODULE_CALL_HOOK(uipc_syscalls_50_hook,
+MODULE_CALL_INT_HOOK(uipc_syscalls_50_hook,
(struct lwp *l, int cmd, void *data), (l, cmd, data), enosys());
-MODULE_CALL_HOOK_DECL(if_43_cvtcmd_hook,
+MODULE_CALL_INT_HOOK_DECL(if_43_cvtcmd_hook,
(u_long *ncmd, u_long ocmd));
-MODULE_CALL_HOOK(if_43_cvtcmd_hook,
+MODULE_CALL_INT_HOOK(if_43_cvtcmd_hook,
(u_long *ncmd, u_long ocmd), (ncmd, ocmd), enosys());
-MODULE_CALL_HOOK_DECL(if_43_ifioctl_hook,
+MODULE_CALL_INT_HOOK_DECL(if_43_ifioctl_hook,
(struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l));
-MODULE_CALL_HOOK(if_43_ifioctl_hook,
+MODULE_CALL_INT_HOOK(if_43_ifioctl_hook,
(struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l),
(so, ocmd, cmd, data, l), enosys());
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.179.2.8 src/sys/net/if_spppsubr.c:1.179.2.9
--- src/sys/net/if_spppsubr.c:1.179.2.8 Sun Jan 13 10:49:51 2019
+++ src/sys/net/if_spppsubr.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.179.2.8 2019/01/13 10:49:51 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.179.2.9 2019/01/14 13:34:28 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.8 2019/01/13 10:49:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.9 2019/01/14 13:34:28 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 */
-MODULE_CALL_HOOK_DECL(sppp_params_50_hook,
+MODULE_CALL_INT_HOOK_DECL(sppp_params_50_hook,
(struct sppp *sp, u_long cmd, void *data));
-MODULE_CALL_HOOK(sppp_params_50_hook,
+MODULE_CALL_INT_HOOK(sppp_params_50_hook,
(struct sppp *sp, u_long cmd, void *data), (sp, cmd, data), enosys());
/*
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.117.2.4 src/sys/net/route.h:1.117.2.5
--- src/sys/net/route.h:1.117.2.4 Sun Jan 13 23:32:22 2019
+++ src/sys/net/route.h Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.117.2.4 2019/01/13 23:32:22 pgoyette Exp $ */
+/* $NetBSD: route.h,v 1.117.2.5 2019/01/14 13:34:28 pgoyette Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -508,14 +508,14 @@ struct rtentry *
void rtcache_unref(struct rtentry *, struct route *);
/* rtsock */
-int rt_ieee80211msg(struct ifnet *, int, void *, size_t);
-int rt_ifannouncemsg(struct ifnet *, int);
-int rt_ifmsg(struct ifnet *);
-int rt_missmsg(int, const struct rt_addrinfo *, int, int);
+void rt_ieee80211msg(struct ifnet *, int, void *, size_t);
+void rt_ifannouncemsg(struct ifnet *, int);
+void rt_ifmsg(struct ifnet *);
+void rt_missmsg(int, const struct rt_addrinfo *, int, int);
struct mbuf *
rt_msg1(int, struct rt_addrinfo *, void *, int);
int rt_msg3(int, struct rt_addrinfo *, void *, struct rt_walkarg *, int *);
-int rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
+void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
void route_enqueue(struct mbuf *, int);
struct llentry;
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.238.2.18 src/sys/net/rtsock.c:1.238.2.19
--- src/sys/net/rtsock.c:1.238.2.18 Sun Jan 13 23:32:22 2019
+++ src/sys/net/rtsock.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.238.2.18 2019/01/13 23:32:22 pgoyette Exp $ */
+/* $NetBSD: rtsock.c,v 1.238.2.19 2019/01/14 13:34:28 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.18 2019/01/13 23:32:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.19 2019/01/14 13:34:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1344,16 +1344,17 @@ rt_msg3(int type, struct rt_addrinfo *rt
/*
* MODULE_HOOK glue for rtsock_14_oifmsg and rtsock_14_iflist
*/
-MODULE_CALL_HOOK_DECL(rtsock_14_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_VOID_HOOK_DECL(rtsock_14_oifmsg_hook, (struct ifnet *ifp));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_14_oifmsg_hook, (struct ifnet *ifp), (ifp), enosys());
+MODULE_CALL_VOID_HOOK(rtsock_14_oifmsg_hook, (struct ifnet *ifp), (ifp),
+ __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_14_iflist_hook,
+MODULE_CALL_INT_HOOK_DECL(rtsock_14_iflist_hook,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_14_iflist_hook,
+MODULE_CALL_INT_HOOK(rtsock_14_iflist_hook,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
@@ -1363,72 +1364,74 @@ MODULE_CALL_HOOK(rtsock_14_iflist_hook,
/*
* MODULE_HOOK glue for rtsock_50 ifaddr_list and various message routines
*/
-MODULE_CALL_HOOK_DECL(rtsock_50_iflist_hook,
+MODULE_CALL_INT_HOOK_DECL(rtsock_50_iflist_hook,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_iflist_hook,
+MODULE_CALL_INT_HOOK(rtsock_50_iflist_hook,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
enosys());
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_rt_missmsg_hook,
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_missmsg_hook,
(int, const struct rt_addrinfo *, int, int));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_rt_missmsg_hook,
+MODULE_CALL_VOID_HOOK(rtsock_50_rt_missmsg_hook,
(int type, const struct rt_addrinfo *rtinfo, int flags, int error),
- (type, rtinfo, flags, error), 0);
+ (type, rtinfo, flags, error), __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifmsg_hook, (struct ifnet *));
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifmsg_hook, (struct ifnet *));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_rt_ifmsg_hook, (struct ifnet *ifp), (ifp), 0);
+MODULE_CALL_VOID_HOOK(rtsock_50_rt_ifmsg_hook, (struct ifnet *ifp), (ifp),
+ __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook,
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook,
(int, struct ifaddr *, int, struct rtentry *));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_rt_newaddrmsg_hook,
+MODULE_CALL_VOID_HOOK(rtsock_50_rt_newaddrmsg_hook,
(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt),
- (cmd, ifa, error, rt), 0);
+ (cmd, ifa, error, rt), __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook,
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook,
(struct ifnet *, int what));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_rt_ifannouncemsg_hook,
- (struct ifnet *ifp, int what), (ifp, what), 0);
+MODULE_CALL_VOID_HOOK(rtsock_50_rt_ifannouncemsg_hook,
+ (struct ifnet *ifp, int what), (ifp, what), __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook,
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook,
(struct ifnet *, int, void *, size_t));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_rt_ieee80211msg_hook,
+MODULE_CALL_VOID_HOOK(rtsock_50_rt_ieee80211msg_hook,
(struct ifnet *ifp, int what, void *data, size_t data_len),
- (ifp, what, data, data_len), 0);
+ (ifp, what, data, data_len), __nothing);
#endif
-MODULE_CALL_HOOK_DECL(rtsock_50_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_VOID_HOOK_DECL(rtsock_50_oifmsg_hook, (struct ifnet *ifp));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_50_oifmsg_hook, (struct ifnet *ifp), (ifp), 0);
+MODULE_CALL_VOID_HOOK(rtsock_50_oifmsg_hook, (struct ifnet *ifp), (ifp),
+ __nothing);
#endif
/*
* MODULE_HOOK glue for rtsock70_newaddrmsg1, rtsock70_ifaddr_listaddr,
* and rtsock70_ifaddr_listif
*/
-MODULE_CALL_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
+MODULE_CALL_VOID_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_70_newaddr_hook, (int cmd, struct ifaddr *ifa),
+MODULE_CALL_VOID_HOOK(rtsock_70_newaddr_hook, (int cmd, struct ifaddr *ifa),
(cmd, ifa), stub_70_rt_newaddrmsg1(cmd, ifa));
#endif
-MODULE_CALL_HOOK_DECL(rtsock_70_iflist_hook,
+MODULE_CALL_INT_HOOK_DECL(rtsock_70_iflist_hook,
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
#ifndef COMPAT_RTSOCK
-MODULE_CALL_HOOK(rtsock_70_iflist_hook,
+MODULE_CALL_INT_HOOK(rtsock_70_iflist_hook,
(struct rt_walkarg *w, struct ifaddr *ifa, struct rt_addrinfo *info),
(w, ifa, info),
enosys());
@@ -1440,7 +1443,7 @@ MODULE_CALL_HOOK(rtsock_70_iflist_hook,
* has failed, or that a protocol has detected timeouts to a particular
* destination.
*/
-int
+void
COMPATNAME(rt_missmsg)(int type, const struct rt_addrinfo *rtinfo, int flags,
int error)
{
@@ -1451,25 +1454,23 @@ COMPATNAME(rt_missmsg)(int type, const s
COMPATCALL(rt_missmsg, (type, rtinfo, flags, error));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
memset(&rtm, 0, sizeof(rtm));
rtm.rtm_pid = curproc->p_pid;
rtm.rtm_flags = RTF_DONE | flags;
rtm.rtm_errno = error;
m = COMPATNAME(rt_msg1)(type, &info, &rtm, sizeof(rtm));
if (m == NULL)
- return 0;
+ return;
mtod(m, struct rt_xmsghdr *)->rtm_addrs = info.rti_addrs;
COMPATNAME(route_enqueue)(m, sa ? sa->sa_family : 0);
-
- return 0;
}
/*
* This routine is called to generate a message from the routing
* socket indicating that the status of a network interface has changed.
*/
-int
+void
COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
{
struct if_xmsghdr ifm;
@@ -1478,7 +1479,7 @@ COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
COMPATCALL(rt_ifmsg, (ifp));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
(void)memset(&info, 0, sizeof(info));
(void)memset(&ifm, 0, sizeof(ifm));
ifm.ifm_index = ifp->if_index;
@@ -1487,11 +1488,10 @@ COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
ifm.ifm_addrs = 0;
m = COMPATNAME(rt_msg1)(RTM_IFINFO, &info, &ifm, sizeof(ifm));
if (m == NULL)
- return 0;
+ return;
COMPATNAME(route_enqueue)(m, 0);
- (void)rtsock_14_oifmsg_hook_call(ifp);
- (void)rtsock_50_oifmsg_hook_call(ifp);
- return 0;
+ rtsock_14_oifmsg_hook_call(ifp);
+ rtsock_50_oifmsg_hook_call(ifp);
}
#ifndef COMPAT_RTSOCK
@@ -1522,7 +1522,7 @@ if_addrflags(struct ifaddr *ifa)
* be unnecessary as the routing socket will automatically generate
* copies of it.
*/
-int
+void
COMPATNAME(rt_newaddrmsg)(int cmd, struct ifaddr *ifa, int error,
struct rtentry *rt)
{
@@ -1549,7 +1549,7 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
COMPATCALL(rt_newaddrmsg, (cmd, ifa, error, rt));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
for (pass = 1; pass < 3; pass++) {
memset(&info, 0, sizeof(info));
switch (cmdpass(cmd, pass)) {
@@ -1626,8 +1626,6 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
COMPATNAME(route_enqueue)(m, sa ? sa->sa_family : 0);
}
#undef cmdpass
- return 0;
-
}
static struct mbuf *
@@ -1648,7 +1646,7 @@ rt_makeifannouncemsg(struct ifnet *ifp,
* This is called to generate routing socket messages indicating
* network interface arrival and departure.
*/
-int
+void
COMPATNAME(rt_ifannouncemsg)(struct ifnet *ifp, int what)
{
struct mbuf *m;
@@ -1656,13 +1654,11 @@ COMPATNAME(rt_ifannouncemsg)(struct ifne
COMPATCALL(rt_ifannouncemsg, (ifp, what));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
m = rt_makeifannouncemsg(ifp, RTM_IFANNOUNCE, what, &info);
if (m == NULL)
- return 0;
+ return;
COMPATNAME(route_enqueue)(m, 0);
-
- return 0;
}
/*
@@ -1670,7 +1666,7 @@ COMPATNAME(rt_ifannouncemsg)(struct ifne
* IEEE80211 wireless events.
* XXX we piggyback on the RTM_IFANNOUNCE msg format in a clumsy way.
*/
-int
+void
COMPATNAME(rt_ieee80211msg)(struct ifnet *ifp, int what, void *data,
size_t data_len)
{
@@ -1679,10 +1675,10 @@ COMPATNAME(rt_ieee80211msg)(struct ifnet
COMPATCALL(rt_ieee80211msg, (ifp, what, data, data_len));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
- return 0;
+ return;
m = rt_makeifannouncemsg(ifp, RTM_IEEE80211, what, &info);
if (m == NULL)
- return 0;
+ return;
/*
* Append the ieee80211 data. Try to stick it in the
* mbuf containing the ifannounce msg; otherwise allocate
@@ -1694,7 +1690,7 @@ COMPATNAME(rt_ieee80211msg)(struct ifnet
struct mbuf *n = m_get(M_NOWAIT, MT_DATA);
if (n == NULL) {
m_freem(m);
- return 0;
+ return;
}
(void)memcpy(mtod(n, void *), data, data_len);
n->m_len = data_len;
@@ -1707,8 +1703,6 @@ COMPATNAME(rt_ieee80211msg)(struct ifnet
m->m_pkthdr.len += data_len;
mtod(m, struct if_xannouncemsghdr *)->ifan_msglen += data_len;
COMPATNAME(route_enqueue)(m, 0);
-
- return 0;
}
#ifndef COMPAT_RTSOCK
Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.60.16.5 src/sys/net80211/ieee80211_ioctl.c:1.60.16.6
--- src/sys/net80211/ieee80211_ioctl.c:1.60.16.5 Sun Jan 13 10:49:51 2019
+++ src/sys/net80211/ieee80211_ioctl.c Mon Jan 14 13:34:28 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.60.16.5 2019/01/13 10:49:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.16.6 2019/01/14 13:34:28 pgoyette Exp $");
#endif
/*
@@ -2559,9 +2559,9 @@ ieee80211_ioctl(struct ieee80211com *ic,
/*
* Compatability glue
*/
-MODULE_CALL_HOOK_DECL(ieee80211_ostats_hook,
+MODULE_CALL_INT_HOOK_DECL(ieee80211_ostats_hook,
(struct ieee80211_ostats *ostats, struct ieee80211_stats *stats));
-MODULE_CALL_HOOK(ieee80211_ostats_hook,
+MODULE_CALL_INT_HOOK(ieee80211_ostats_hook,
(struct ieee80211_ostats *ostats, struct ieee80211_stats *stats),
(ostats, stats), enosys());
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.98.2.8 src/sys/opencrypto/cryptodev.c:1.98.2.9
--- src/sys/opencrypto/cryptodev.c:1.98.2.8 Sun Jan 13 10:49:51 2019
+++ src/sys/opencrypto/cryptodev.c Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.98.2.8 2019/01/13 10:49:51 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.98.2.9 2019/01/14 13:34:28 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.8 2019/01/13 10:49:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.9 2019/01/14 13:34:28 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,9 +227,9 @@ cryptof_write(file_t *fp, off_t *poff,
* kernel which doesn't contain the local stuff, so the compat
* code cannot directly reference them as globals.
*/
-MODULE_CALL_HOOK_DECL(ocryptof_50_hook,
+MODULE_CALL_INT_HOOK_DECL(ocryptof_50_hook,
(struct file *fp, u_long cmd, void *data));
-MODULE_CALL_HOOK(ocryptof_50_hook,
+MODULE_CALL_INT_HOOK(ocryptof_50_hook,
(struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
/* ARGSUSED */
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.47 src/sys/sys/compat_stub.h:1.1.2.48
--- src/sys/sys/compat_stub.h:1.1.2.47 Sun Jan 13 23:32:22 2019
+++ src/sys/sys/compat_stub.h Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.47 2019/01/13 23:32:22 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.48 2019/01/14 13:34:28 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -63,32 +63,33 @@ struct usb_device_info_old;
struct usb_event;
struct usb_event_old;
struct uio;
-MODULE_HOOK(usb_subr_30_fill_hook,
+MODULE_HOOK(usb_subr_30_fill_hook, int,
(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)));
-MODULE_HOOK(usb_subr_30_copy_hook,
+MODULE_HOOK(usb_subr_30_copy_hook, int,
(struct usb_event *, struct usb_event_old *, struct uio *));
/*
* Routine vector for dev/ccd ioctl()
*/
-MODULE_HOOK(ccd_ioctl_60_hook, (dev_t, u_long, void *, int, struct lwp *,
+MODULE_HOOK(ccd_ioctl_60_hook, int, (dev_t, u_long, void *, int, struct lwp *,
int (*f)(dev_t, u_long, void *, int, struct lwp *)))
/*
* Routine vector for dev/clockctl ioctl()
*/
-MODULE_HOOK(clockctl_ioctl_50_hook, (dev_t, u_long, void *, int, struct lwp *));
+MODULE_HOOK(clockctl_ioctl_50_hook, int,
+ (dev_t, u_long, void *, int, struct lwp *));
/*
* if_sppp device compatability ioctl subroutine
*/
struct sppp;
-MODULE_HOOK(sppp_params_50_hook, (struct sppp *, u_long, void *));
+MODULE_HOOK(sppp_params_50_hook, int, (struct sppp *, u_long, void *));
/*
* cryptodev compatability ioctl
@@ -100,7 +101,7 @@ struct csession;
struct crypt_op;
struct crypt_n_op;
struct kmutex_t;
-MODULE_HOOK(ocryptof_50_hook, (struct file *, u_long, void *));
+MODULE_HOOK(ocryptof_50_hook, int, (struct file *, u_long, void *));
/*
* raidframe compatability
@@ -108,19 +109,19 @@ MODULE_HOOK(ocryptof_50_hook, (struct fi
struct RF_Config_s;
struct RF_Raid_s;
-MODULE_HOOK(raidframe50_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
- struct RF_Config_s **));
-MODULE_HOOK(raidframe80_ioctl_hook, (int, int, struct RF_Raid_s *, int, void *,
- struct RF_Config_s **));
+MODULE_HOOK(raidframe50_ioctl_hook, int,
+ (int, int, struct RF_Raid_s *, int, void *, struct RF_Config_s **));
+MODULE_HOOK(raidframe80_ioctl_hook, int,
+ (int, int, struct RF_Raid_s *, int, void *, struct RF_Config_s **));
/*
* puffs compatability
*/
struct puffs_req;
-MODULE_HOOK(puffs_50_out_hook,
+MODULE_HOOK(puffs_50_out_hook, int,
(struct puffs_req *, struct puffs_req **, ssize_t *)); /* outgoing */
-MODULE_HOOK(puffs_50_in_hook,
+MODULE_HOOK(puffs_50_in_hook, void,
(struct puffs_req *, struct puffs_req *)); /* incoming */
/*
@@ -129,7 +130,7 @@ MODULE_HOOK(puffs_50_in_hook,
struct wscons_event;
struct uio;
-MODULE_HOOK(wsevent_50_copyout_events_hook,
+MODULE_HOOK(wsevent_50_copyout_events_hook, int,
(const struct wscons_event *, int, struct uio *));
/*
@@ -138,28 +139,28 @@ MODULE_HOOK(wsevent_50_copyout_events_ho
struct power_event;
struct sysmon_pswitch;
-MODULE_HOOK(compat_sysmon_power_40_hook, (struct power_event *,
- struct sysmon_pswitch *, int));
+MODULE_HOOK(compat_sysmon_power_40_hook, void,
+ (struct power_event *, struct sysmon_pswitch *, int));
/*
* compat_bio indirect function pointer
*/
-MODULE_HOOK(compat_bio_30_hook, (void *, u_long, void *,
- int(*)(void *, u_long, void *)));
+MODULE_HOOK(compat_bio_30_hook, int,
+ (void *, u_long, void *, int(*)(void *, u_long, void *)));
/*
* vnd_30 ioctl compatability
*/
struct vattr;
-MODULE_HOOK(compat_vndioctl_30_hook, (u_long, struct lwp *, void *, int,
+MODULE_HOOK(compat_vndioctl_30_hook, int, (u_long, struct lwp *, void *, int,
struct vattr *, int (*)(struct lwp *, void *, int, struct vattr *)));
/*
* vnd_50 ioctl compatability
*/
struct vattr;
-MODULE_HOOK(compat_vndioctl_50_hook, (u_long, struct lwp *, void *, int,
+MODULE_HOOK(compat_vndioctl_50_hook, int, (u_long, struct lwp *, void *, int,
struct vattr *, int (*)(struct lwp *, void *, int, struct vattr *)));
/*
@@ -168,34 +169,34 @@ MODULE_HOOK(compat_vndioctl_50_hook, (u_
struct ieee80211_ostats;
struct ieee80211_stats;
-MODULE_HOOK(ieee80211_ostats_hook, (struct ieee80211_ostats *,
- struct ieee80211_stats *));
+MODULE_HOOK(ieee80211_ostats_hook, int,
+ (struct ieee80211_ostats *, struct ieee80211_stats *));
/*
* if_43 compatability
*/
struct socket;
-MODULE_HOOK(if_43_cvtcmd_hook, (u_long *, u_long));
-MODULE_HOOK(if_43_ifioctl_hook,
+MODULE_HOOK(if_43_cvtcmd_hook, int, (u_long *, u_long));
+MODULE_HOOK(if_43_ifioctl_hook, int,
(struct socket *, u_long, u_long, void *, struct lwp *));
/*
* if43_20 compatability
*/
-MODULE_HOOK(if43_20_hook, (u_long cmd));
+MODULE_HOOK(if43_20_hook, int, (u_long));
/*
* uipc_syscalls_40 compatability
*/
-MODULE_HOOK(uipc_syscalls_40_hook, (u_long cmd, void *data));
+MODULE_HOOK(uipc_syscalls_40_hook, int, (u_long, void *));
/*
* uipc_syscalls_50 compatability
*/
-MODULE_HOOK(uipc_syscalls_50_hook, (struct lwp *, u_long, void *));
+MODULE_HOOK(uipc_syscalls_50_hook, int, (struct lwp *, u_long, void *));
/*
* rtsock 14 compatability
@@ -203,8 +204,8 @@ MODULE_HOOK(uipc_syscalls_50_hook, (stru
struct ifnet;
struct rt_walkarg;
struct rt_addrinfo;
-MODULE_HOOK(rtsock_14_oifmsg_hook, (struct ifnet *));
-MODULE_HOOK(rtsock_14_iflist_hook,
+MODULE_HOOK(rtsock_14_oifmsg_hook, void, (struct ifnet *));
+MODULE_HOOK(rtsock_14_iflist_hook, int,
(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *, size_t));
/*
@@ -213,31 +214,31 @@ MODULE_HOOK(rtsock_14_iflist_hook,
struct rtentry;
struct ifaddr;
-MODULE_HOOK(rtsock_50_iflist_hook,
+MODULE_HOOK(rtsock_50_oifmsg_hook, void, (struct ifnet *));
+MODULE_HOOK(rtsock_50_iflist_hook, int,
(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *, size_t));
-MODULE_HOOK(rtsock_50_oifmsg_hook, (struct ifnet *));
-MODULE_HOOK(rtsock_50_rt_missmsg_hook,
+MODULE_HOOK(rtsock_50_rt_missmsg_hook, void,
(int, const struct rt_addrinfo *, int, int));
-MODULE_HOOK(rtsock_50_rt_ifmsg_hook, (struct ifnet *));
-MODULE_HOOK(rtsock_50_rt_newaddrmsg_hook,
+MODULE_HOOK(rtsock_50_rt_ifmsg_hook, void, (struct ifnet *));
+MODULE_HOOK(rtsock_50_rt_newaddrmsg_hook, void,
(int, struct ifaddr *, int, struct rtentry *));
-MODULE_HOOK(rtsock_50_rt_ifannouncemsg_hook, (struct ifnet *, int));
-MODULE_HOOK(rtsock_50_rt_ieee80211msg_hook,
+MODULE_HOOK(rtsock_50_rt_ifannouncemsg_hook, void, (struct ifnet *, int));
+MODULE_HOOK(rtsock_50_rt_ieee80211msg_hook, void,
(struct ifnet *, int, void *, size_t));
/*
* Hooks for rtsock_70
*/
struct ifaddr;
-MODULE_HOOK(rtsock_70_newaddr_hook, (int, struct ifaddr *));
-MODULE_HOOK(rtsock_70_iflist_hook,
+MODULE_HOOK(rtsock_70_newaddr_hook, void, (int, struct ifaddr *));
+MODULE_HOOK(rtsock_70_iflist_hook, int,
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
/*
* modctl handler for old style OSTAT
*/
struct iovec;
-MODULE_HOOK(compat_modstat_80_hook, (int, struct iovec *, void *));
+MODULE_HOOK(compat_modstat_80_hook, int, (int, struct iovec *, void *));
/*
* mask for kern_sig_43's killpg
@@ -248,44 +249,48 @@ extern int kern_sig_43_pgid_mask;
* Hooks for kern_proc.c for netbsd32 compat
*/
struct ps_strings;
-MODULE_HOOK(kern_proc_32_copyin_hook, (struct proc *, struct ps_strings *));
-MODULE_HOOK(kern_proc_32_base_hook, (char **, size_t, vaddr_t *));
+MODULE_HOOK(kern_proc_32_copyin_hook, int,
+ (struct proc *, struct ps_strings *));
+MODULE_HOOK(kern_proc_32_base_hook, void, (char **, size_t, vaddr_t *));
/*
* Hook to allow sparc fpu code to see if a process is using sunos
* emulation, and select proper fup codes
*/
struct emul;
-MODULE_HOOK(get_emul_sunos_hook, (const struct emul **));
+MODULE_HOOK(get_emul_sunos_hook, int, (const struct emul **));
/*
* Hooks for rnd_ioctl_50
*/
-MODULE_HOOK(rnd_ioctl_50_hook, (struct file *, u_long, void *));
-MODULE_HOOK(rnd_ioctl_50_32_hook, (struct file *, u_long, void *));
+MODULE_HOOK(rnd_ioctl_50_hook, int, (struct file *, u_long, void *));
+MODULE_HOOK(rnd_ioctl_50_32_hook, int, (struct file *, u_long, void *));
/*
* Hooks for compat_60 ttioctl and ptmioctl
*/
-MODULE_HOOK(compat_60_ttioctl_hook, (dev_t, u_long, void *, int, struct lwp *));
-MODULE_HOOK(compat_60_ptmioctl_hook, (dev_t, u_long, void *, int, struct lwp *));
+MODULE_HOOK(compat_60_ttioctl_hook, int,
+ (dev_t, u_long, void *, int, struct lwp *));
+MODULE_HOOK(compat_60_ptmioctl_hook, int,
+ (dev_t, u_long, void *, int, struct lwp *));
/*
* Hook for compat_10 openat
*/
struct pathbuf;
-MODULE_HOOK(compat_10_openat_hook, (struct pathbuf **));
+MODULE_HOOK(compat_10_openat_hook, int, (struct pathbuf **));
/*
* Hook for compat_70_unp_addsockcred
*/
struct mbuf;
-MODULE_HOOK(compat_70_unp_hook, (struct mbuf **, struct lwp *, struct mbuf *));
+MODULE_HOOK(compat_70_unp_hook, void,
+ (struct mbuf **, struct lwp *, struct mbuf *));
/*
* Hook for sysvipc50 sysctl
*/
#include <sys/sysctl.h>
-MODULE_HOOK(sysvipc50_sysctl_hook, (SYSCTLFN_PROTO));
+MODULE_HOOK(sysvipc50_sysctl_hook, int, (SYSCTLFN_PROTO));
#endif /* _SYS_COMPAT_STUB_H */
Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.9 src/sys/sys/module_hook.h:1.1.2.10
--- src/sys/sys/module_hook.h:1.1.2.9 Sun Jan 13 10:49:51 2019
+++ src/sys/sys/module_hook.h Mon Jan 14 13:34:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.9 2019/01/13 10:49:51 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.10 2019/01/14 13:34:28 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -45,14 +45,14 @@
* unloaded.
*/
-#define MODULE_HOOK(hook, args) \
+#define MODULE_HOOK(hook, type, args) \
extern struct hook ## _t { \
kmutex_t mtx; \
kcondvar_t cv; \
struct localcount lc; \
pserialize_t psz; \
bool hooked; \
- int (*f)args; \
+ type (*f)args; \
} hook __cacheline_aligned;
#define MODULE_SET_HOOK(hook, waitchan, func) \
@@ -104,11 +104,15 @@ static void (hook ## _unset)(void) \
pserialize_destroy(hook.psz); \
}
-#define MODULE_CALL_HOOK_DECL(hook, decl) \
+#define MODULE_CALL_INT_HOOK_DECL(hook, decl) \
int \
hook ## _call decl;
-#define MODULE_CALL_HOOK(hook, decl, args, default) \
+#define MODULE_CALL_VOID_HOOK_DECL(hook, decl) \
+void \
+hook ## _call decl;
+
+#define MODULE_CALL_INT_HOOK(hook, decl, args, default) \
int \
hook ## _call decl \
{ \
@@ -133,4 +137,28 @@ hook ## _call decl \
return __hook_error; \
}
+#define MODULE_CALL_VOID_HOOK(hook, decl, args, default) \
+void \
+hook ## _call decl \
+{ \
+ bool __hooked; \
+ int __hook_s; \
+ \
+ __hook_s = pserialize_read_enter(); \
+ __hooked = hook.hooked; \
+ if (__hooked) { \
+ membar_consumer(); \
+ localcount_acquire(&hook.lc); \
+ } \
+ pserialize_read_exit(__hook_s); \
+ \
+ if (__hooked) { \
+ (*hook.f)args; \
+ localcount_release(&hook.lc, &hook.cv, \
+ &hook.mtx); \
+ } else { \
+ default; \
+ } \
+}
+
#endif /* _SYS_MODULE_HOOK_H */
