Module Name: src
Committed By: pgoyette
Date: Fri Jan 18 00:01:02 UTC 2019
Modified Files:
src/sys/arch/sparc/fpu [pgoyette-compat]: fpu.c
src/sys/compat/common [pgoyette-compat]: if_43.c uipc_usrreq_70.c
src/sys/compat/netbsd32 [pgoyette-compat]: 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/usb [pgoyette-compat]: ugen.c uhid.c usb.c
src/sys/dev/wscons [pgoyette-compat]: wsevent.c
src/sys/fs/puffs [pgoyette-compat]: puffs_msgif.c
src/sys/kern [pgoyette-compat]: kern_proc.c 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 rtsock.c
rtsock_shared.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:
Don't restrict hooks to having only int or void types. Pass the hook's
type to the various macros, as needed.
Allows us to reduce diffs to original in at least one or two places (we
no longer have to provide an additional parameter to the hook routine
for returning a non-int return value).
To generate a diff of this commit:
cvs rdiff -u -r1.27.46.3 -r1.27.46.4 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.14.2.12 -r1.14.2.13 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.20.4 -r1.1.20.5 src/sys/compat/common/uipc_usrreq_70.c
cvs rdiff -u -r1.6.2.11 -r1.6.2.12 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.15.2.3 -r1.15.2.4 src/sys/compat/sys/socket.h
cvs rdiff -u -r1.13.16.7 -r1.13.16.8 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.10 -r1.175.2.11 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.10 -r1.35.14.11 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.12 -r1.263.2.13 src/sys/dev/vnd.c
cvs rdiff -u -r1.356.2.8 -r1.356.2.9 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.139.2.8 -r1.139.2.9 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.7 -r1.101.2.8 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.9 -r1.168.2.10 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.8 -r1.37.2.9 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.101.10.8 -r1.101.10.9 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.209.2.12 -r1.209.2.13 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.89.16.6 -r1.89.16.7 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.23.2.15 -r1.23.2.16 src/sys/kern/sys_module.c
cvs rdiff -u -r1.32.16.8 -r1.32.16.9 src/sys/kern/sysv_ipc.c
cvs rdiff -u -r1.275.2.7 -r1.275.2.8 src/sys/kern/tty.c
cvs rdiff -u -r1.37.16.4 -r1.37.16.5 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.183.2.8 -r1.183.2.9 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.518.2.4 -r1.518.2.5 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.419.2.20 -r1.419.2.21 src/sys/net/if.c
cvs rdiff -u -r1.179.2.9 -r1.179.2.10 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.238.2.22 -r1.238.2.23 src/sys/net/rtsock.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.60.16.6 -r1.60.16.7 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.98.2.9 -r1.98.2.10 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.1.2.50 -r1.1.2.51 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 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/sparc/fpu/fpu.c
diff -u src/sys/arch/sparc/fpu/fpu.c:1.27.46.3 src/sys/arch/sparc/fpu/fpu.c:1.27.46.4
--- src/sys/arch/sparc/fpu/fpu.c:1.27.46.3 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/sparc/fpu/fpu.c Fri Jan 18 00:01:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: fpu.c,v 1.27.46.4 2019/01/18 00:01:00 pgoyette Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.4 2019/01/18 00:01:00 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_INT_HOOK_DECL(get_emul_sunos_hook, (const struct emul **emul));
-MODULE_CALL_INT_HOOK(get_emul_sunos_hook, (const struct emul ** emul), (emul),
+MODULE_CALL_HOOK_DECL(get_emul_sunos_hook, int, (const struct emul **emul));
+MODULE_CALL_HOOK(get_emul_sunos_hook, int, (const struct emul ** emul), (emul),
enosys());
/*
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.12 src/sys/compat/common/if_43.c:1.14.2.13
--- src/sys/compat/common/if_43.c:1.14.2.12 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/common/if_43.c Fri Jan 18 00:01:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.12 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.13 2019/01/18 00:01:00 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.12 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.13 2019/01/18 00:01:00 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_INT_HOOK_DECL(if43_20_hook, (u_long ncmd));
-MODULE_CALL_INT_HOOK(if43_20_hook, (u_long ncmd), (ncmd), enosys());
+MODULE_CALL_HOOK_DECL(if43_20_hook, int, (u_long ncmd));
+MODULE_CALL_HOOK(if43_20_hook, int, (u_long ncmd), (ncmd), enosys());
/*
* Use a wrapper so that the compat_cvtcmd() can return a u_long
Index: src/sys/compat/common/uipc_usrreq_70.c
diff -u src/sys/compat/common/uipc_usrreq_70.c:1.1.20.4 src/sys/compat/common/uipc_usrreq_70.c:1.1.20.5
--- src/sys/compat/common/uipc_usrreq_70.c:1.1.20.4 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/common/uipc_usrreq_70.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.4 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 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.4 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,9 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_
#include <compat/sys/socket.h>
-void
-compat_70_unp_addsockcred(struct mbuf **ret, struct lwp *l,
- struct mbuf *control)
+struct mbuf *
+compat_70_unp_addsockcred(struct lwp *l, struct mbuf *control)
{
struct sockcred70 *sc;
struct mbuf *m;
@@ -58,8 +57,7 @@ compat_70_unp_addsockcred(struct mbuf **
m = sbcreatecontrol1(&p, SOCKCRED70SIZE(kauth_cred_ngroups(l->l_cred)),
SCM_OCREDS, SOL_SOCKET, M_WAITOK);
if (m == NULL) {
- *ret = control;
- return;
+ return control;
}
sc = p;
@@ -72,7 +70,7 @@ compat_70_unp_addsockcred(struct mbuf **
for (int i = 0; i < sc->sc_ngroups; i++)
sc->sc_groups[i] = kauth_cred_group(l->l_cred, i);
- *ret = m_add(control, m);
+ return m_add(control, m);
}
MODULE_SET_HOOK(compat_70_unp_hook, "unp_70", compat_70_unp_addsockcred);
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.11 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.12
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.11 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/netbsd32/netbsd32_module.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.11 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.12 2019/01/18 00:01:01 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.11 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.12 2019/01/18 00:01:01 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_INT_HOOK_DECL(compat32_80_modctl_hook,
+MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook, int,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result));
-MODULE_CALL_INT_HOOK(compat32_80_modctl_hook,
+MODULE_CALL_HOOK(compat32_80_modctl_hook, int,
(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.3 src/sys/compat/sys/socket.h:1.15.2.4
--- src/sys/compat/sys/socket.h:1.15.2.3 Mon Jan 14 13:34:27 2019
+++ src/sys/compat/sys/socket.h Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.15.2.3 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: socket.h,v 1.15.2.4 2019/01/18 00:01:01 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);
-void compat_70_unp_addsockcred(struct mbuf **, struct lwp *, struct mbuf *);
+struct mbuf * compat_70_unp_addsockcred(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.7 src/sys/dev/bio.c:1.13.16.8
--- src/sys/dev/bio.c:1.13.16.7 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/bio.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.13.16.7 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.13.16.8 2019/01/18 00:01:01 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.7 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.8 2019/01/18 00:01:01 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_INT_HOOK_DECL(compat_bio_30_hook,
+MODULE_CALL_HOOK_DECL(compat_bio_30_hook, int,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)));
-MODULE_CALL_INT_HOOK(compat_bio_30_hook,
+MODULE_CALL_HOOK(compat_bio_30_hook, int,
(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.10 src/sys/dev/ccd.c:1.175.2.11
--- src/sys/dev/ccd.c:1.175.2.10 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/ccd.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.175.2.10 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.175.2.11 2019/01/18 00:01:01 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.10 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.11 2019/01/18 00:01:01 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1061,12 +1061,12 @@ 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_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_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 *)),
+MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, int,
+ (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, int,
+ (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());
/* ARGSUSED */
Index: src/sys/dev/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.10 src/sys/dev/clockctl.c:1.35.14.11
--- src/sys/dev/clockctl.c:1.35.14.10 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/clockctl.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.10 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.11 2019/01/18 00:01:01 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.10 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.11 2019/01/18 00:01:01 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_INT_HOOK_DECL(clockctl_ioctl_50_hook,
+MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook, int,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l));
-MODULE_CALL_INT_HOOK(clockctl_ioctl_50_hook,
+MODULE_CALL_HOOK(clockctl_ioctl_50_hook, int,
(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.12 src/sys/dev/vnd.c:1.263.2.13
--- src/sys/dev/vnd.c:1.263.2.12 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/vnd.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.263.2.12 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.263.2.13 2019/01/18 00:01:01 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.12 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.263.2.13 2019/01/18 00:01:01 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1126,19 +1126,19 @@ vndioctl_get(struct lwp *l, void *data,
}
}
-MODULE_CALL_INT_HOOK_DECL(compat_vndioctl_30_hook,
+MODULE_CALL_HOOK_DECL(compat_vndioctl_30_hook, int,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)));
-MODULE_CALL_INT_HOOK(compat_vndioctl_30_hook,
+MODULE_CALL_HOOK(compat_vndioctl_30_hook, int,
(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_INT_HOOK_DECL(compat_vndioctl_50_hook,
+MODULE_CALL_HOOK_DECL(compat_vndioctl_50_hook, int,
(u_long cmd, struct lwp *l, void *data, int unit, struct vattr *vattr,
int (*ff)(struct lwp *, void *, int, struct vattr *)));
-MODULE_CALL_INT_HOOK(compat_vndioctl_50_hook,
+MODULE_CALL_HOOK(compat_vndioctl_50_hook, int,
(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.8 src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.9
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.356.2.8 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.8 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.9 2019/01/18 00:01:01 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_INT_HOOK_DECL(raidframe50_ioctl_hook,
+MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_INT_HOOK(raidframe50_ioctl_hook,
+MODULE_CALL_HOOK(raidframe50_ioctl_hook, int,
(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_INT_HOOK_DECL(raidframe80_ioctl_hook,
+MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_INT_HOOK(raidframe80_ioctl_hook,
+MODULE_CALL_HOOK(raidframe80_ioctl_hook, int,
(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/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.139.2.8 src/sys/dev/usb/ugen.c:1.139.2.9
--- src/sys/dev/usb/ugen.c:1.139.2.8 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/usb/ugen.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.139.2.8 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: ugen.c,v 1.139.2.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.9 2019/01/18 00:01:01 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);
}
-MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_hook,
+MODULE_CALL_HOOK_DECL(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)));
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.101.2.7 src/sys/dev/usb/uhid.c:1.101.2.8
--- src/sys/dev/usb/uhid.c:1.101.2.7 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/usb/uhid.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.101.2.7 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: uhid.c,v 1.101.2.8 2019/01/18 00:01:01 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.7 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.101.2.8 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -513,7 +513,7 @@ uhidwrite(dev_t dev, struct uio *uio, in
return error;
}
-MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_hook,
+MODULE_CALL_HOOK_DECL(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)));
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.168.2.9 src/sys/dev/usb/usb.c:1.168.2.10
--- src/sys/dev/usb/usb.c:1.168.2.9 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/usb/usb.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.168.2.9 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: usb.c,v 1.168.2.10 2019/01/18 00:01:01 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.9 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.168.2.10 2019/01/18 00:01:01 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_INT_HOOK_DECL(usb_subr_30_copy_hook,
+MODULE_CALL_HOOK_DECL(usb_subr_30_copy_hook, int,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio));
-MODULE_CALL_INT_HOOK(usb_subr_30_copy_hook,
+MODULE_CALL_HOOK(usb_subr_30_copy_hook, int,
(struct usb_event *ue, struct usb_event_old *ueo, struct uio *uio),
(ue, ueo, uio), enosys());
@@ -736,11 +736,11 @@ usbclose(dev_t dev, int flag, int mode,
}
/* Call hook for usbd30_fill_device_info_old() */
-MODULE_CALL_INT_HOOK_DECL(usb_subr_30_fill_hook,
+MODULE_CALL_HOOK_DECL(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_CALL_INT_HOOK(usb_subr_30_fill_hook,
+MODULE_CALL_HOOK(usb_subr_30_fill_hook, int,
(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),
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.37.2.8 src/sys/dev/wscons/wsevent.c:1.37.2.9
--- src/sys/dev/wscons/wsevent.c:1.37.2.8 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/wscons/wsevent.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.37.2.8 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.37.2.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37.2.9 2019/01/18 00:01:01 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_INT_HOOK_DECL(wsevent_50_copyout_events_hook,
+MODULE_CALL_HOOK_DECL(wsevent_50_copyout_events_hook, int,
(const struct wscons_event *events, int cnt, struct uio *uio));
-MODULE_CALL_INT_HOOK(wsevent_50_copyout_events_hook,
+MODULE_CALL_HOOK(wsevent_50_copyout_events_hook, int,
(const struct wscons_event *events, int cnt, struct uio *uio),
(events, cnt, uio), enosys());
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.101.10.8 src/sys/fs/puffs/puffs_msgif.c:1.101.10.9
--- src/sys/fs/puffs/puffs_msgif.c:1.101.10.8 Mon Jan 14 13:34:28 2019
+++ src/sys/fs/puffs/puffs_msgif.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.101.10.8 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.101.10.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.9 2019/01/18 00:01:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -325,9 +325,9 @@ puffs_getmsgid(struct puffs_mount *pmp)
/* Routines to call the compat hooks */
/* Out-going */
-MODULE_CALL_INT_HOOK_DECL(puffs_50_out_hook,
+MODULE_CALL_HOOK_DECL(puffs_50_out_hook, int,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap));
-MODULE_CALL_INT_HOOK(puffs_50_out_hook,
+MODULE_CALL_HOOK(puffs_50_out_hook, int,
(struct puffs_req *oreq, struct puffs_req **creqp, ssize_t *deltap),
(oreq, creqp, deltap), enosys());
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.12 src/sys/kern/kern_proc.c:1.209.2.13
--- src/sys/kern/kern_proc.c:1.209.2.12 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/kern_proc.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.209.2.12 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: kern_proc.c,v 1.209.2.13 2019/01/18 00:01:01 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.12 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.13 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1896,9 +1896,9 @@ sysctl_doeproc(SYSCTLFN_ARGS)
* compat_netbsd32 hooks
*/
#if !defined(_RUMPKERNEL)
-MODULE_CALL_INT_HOOK_DECL(kern_proc_32_copyin_hook,
+MODULE_CALL_HOOK_DECL(kern_proc_32_copyin_hook, int,
(struct proc *p, struct ps_strings *s));
-MODULE_CALL_INT_HOOK(kern_proc_32_copyin_hook,
+MODULE_CALL_HOOK(kern_proc_32_copyin_hook, int,
(struct proc *p, struct ps_strings *s), (p, s), enosys());
MODULE_CALL_VOID_HOOK_DECL(kern_proc_32_base_hook,
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.89.16.6 src/sys/kern/kern_rndq.c:1.89.16.7
--- src/sys/kern/kern_rndq.c:1.89.16.6 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/kern_rndq.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.89.16.6 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.89.16.7 2019/01/18 00:01:01 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.6 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.89.16.7 2019/01/18 00:01:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1446,13 +1446,13 @@ krs_setflags(krndsource_t *kr, uint32_t
}
}
-MODULE_CALL_INT_HOOK_DECL(rnd_ioctl_50_hook, (struct file *, u_long, void *));
-MODULE_CALL_INT_HOOK_DECL(rnd_ioctl_50_32_hook,
+MODULE_CALL_HOOK_DECL(rnd_ioctl_50_hook, int, (struct file *, u_long, void *));
+MODULE_CALL_HOOK_DECL(rnd_ioctl_50_32_hook, int,
(struct file *, u_long, void *));
-MODULE_CALL_INT_HOOK(rnd_ioctl_50_hook,
+MODULE_CALL_HOOK(rnd_ioctl_50_hook, int,
(struct file *fp, u_long cmd, void *addr), (fp, cmd, addr), enosys());
-MODULE_CALL_INT_HOOK(rnd_ioctl_50_32_hook,
+MODULE_CALL_HOOK(rnd_ioctl_50_32_hook, int,
(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.15 src/sys/kern/sys_module.c:1.23.2.16
--- src/sys/kern/sys_module.c:1.23.2.15 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/sys_module.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.23.2.15 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: sys_module.c,v 1.23.2.16 2019/01/18 00:01:01 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.15 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.16 2019/01/18 00:01:01 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_INT_HOOK_DECL(compat_modstat_80_hook,
+MODULE_CALL_HOOK_DECL(compat_modstat_80_hook, int,
(int cmd, struct iovec *iov, void *arg));
-MODULE_CALL_INT_HOOK(compat_modstat_80_hook,
+MODULE_CALL_HOOK(compat_modstat_80_hook, int,
(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.8 src/sys/kern/sysv_ipc.c:1.32.16.9
--- src/sys/kern/sysv_ipc.c:1.32.16.8 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/sysv_ipc.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_ipc.c,v 1.32.16.8 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: sysv_ipc.c,v 1.32.16.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.32.16.9 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -347,8 +347,8 @@ stub_sysvipc50_sysctl(SYSCTLFN_ARGS)
return EPASSTHROUGH;
}
-MODULE_CALL_INT_HOOK_DECL(sysvipc50_sysctl_hook, (SYSCTLFN_PROTO));
-MODULE_CALL_INT_HOOK(sysvipc50_sysctl_hook, (SYSCTLFN_ARGS),
+MODULE_CALL_HOOK_DECL(sysvipc50_sysctl_hook, int, (SYSCTLFN_PROTO));
+MODULE_CALL_HOOK(sysvipc50_sysctl_hook, int, (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.7 src/sys/kern/tty.c:1.275.2.8
--- src/sys/kern/tty.c:1.275.2.7 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/tty.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.275.2.7 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: tty.c,v 1.275.2.8 2019/01/18 00:01:01 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.7 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.275.2.8 2019/01/18 00:01:01 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_INT_HOOK_DECL(compat_60_ttioctl_hook,
+MODULE_CALL_HOOK_DECL(compat_60_ttioctl_hook, int,
(dev_t, u_long, void *, int, struct lwp *));
-MODULE_CALL_INT_HOOK(compat_60_ttioctl_hook,
+MODULE_CALL_HOOK(compat_60_ttioctl_hook, int,
(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.4 src/sys/kern/tty_ptm.c:1.37.16.5
--- src/sys/kern/tty_ptm.c:1.37.16.4 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/tty_ptm.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.37.16.4 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37.16.5 2019/01/18 00:01:01 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.4 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.16.5 2019/01/18 00:01:01 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_INT_HOOK_DECL(compat_60_ptmioctl_hook,
+MODULE_CALL_HOOK_DECL(compat_60_ptmioctl_hook, int,
(dev_t, u_long, void *, int, struct lwp *));
-MODULE_CALL_INT_HOOK(compat_60_ptmioctl_hook,
+MODULE_CALL_HOOK(compat_60_ptmioctl_hook, int,
(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.8 src/sys/kern/uipc_usrreq.c:1.183.2.9
--- src/sys/kern/uipc_usrreq.c:1.183.2.8 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/uipc_usrreq.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.183.2.8 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.183.2.9 2019/01/18 00:01:01 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.8 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.183.2.9 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -198,14 +198,14 @@ static int unp_defer;
/* Compat interface */
-void stub_compat_70_unp_addsockcred(struct mbuf **, lwp_t *, struct mbuf *);
+struct mbuf * stub_compat_70_unp_addsockcred(lwp_t *, struct mbuf *);
-void stub_compat_70_unp_addsockcred(struct mbuf** ret, struct lwp *lwp,
+struct mbuf * stub_compat_70_unp_addsockcred(struct lwp *lwp,
struct mbuf *control)
{
/* just copy our initial argument */
- *ret = control;
+ return control;
}
bool *compat70_ocreds_valid = false;
@@ -330,11 +330,11 @@ unp_free(struct unpcb *unp)
kmem_free(unp, sizeof(*unp));
}
-MODULE_CALL_VOID_HOOK_DECL(compat_70_unp_hook,
- (struct mbuf **, struct lwp *, struct mbuf *));
-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));
+MODULE_CALL_HOOK_DECL(compat_70_unp_hook, struct mbuf *,
+ (struct lwp *, struct mbuf *));
+MODULE_CALL_HOOK(compat_70_unp_hook, struct mbuf *,
+ (struct lwp *lwp, struct mbuf *control),
+ (lwp, control), stub_compat_70_unp_addsockcred(lwp, control));
static int
unp_output(struct mbuf *m, struct mbuf *control, struct unpcb *unp)
@@ -356,7 +356,7 @@ unp_output(struct mbuf *m, struct mbuf *
if (unp->unp_conn->unp_flags & UNP_WANTCRED)
control = unp_addsockcred(curlwp, control);
if (unp->unp_conn->unp_flags & UNP_OWANTCRED)
- compat_70_unp_hook_call(&control, curlwp, control);
+ control = compat_70_unp_hook_call(curlwp, control);
if (sbappendaddr(&so2->so_rcv, (const struct sockaddr *)sun, m,
control) == 0) {
unp_dispose(control);
@@ -537,7 +537,7 @@ unp_send(struct socket *so, struct mbuf
* SOCK_STREAM and SOCK_SEQPACKET.
*/
unp->unp_conn->unp_flags &= ~UNP_OWANTCRED;
- compat_70_unp_hook_call(&control, curlwp, control);
+ control = compat_70_unp_hook_call(curlwp, control);
}
/*
* Send to paired receive port, and then reduce
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.518.2.4 src/sys/kern/vfs_syscalls.c:1.518.2.5
--- src/sys/kern/vfs_syscalls.c:1.518.2.4 Mon Jan 14 13:34:28 2019
+++ src/sys/kern/vfs_syscalls.c Fri Jan 18 00:01:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.518.2.4 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.518.2.5 2019/01/18 00:01:01 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.4 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.518.2.5 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1635,8 +1635,8 @@ stub_sys_openat_10(struct pathbuf **pb)
return 0;
}
-MODULE_CALL_INT_HOOK_DECL(compat_10_openat_hook, (struct pathbuf **));
-MODULE_CALL_INT_HOOK(compat_10_openat_hook, (struct pathbuf **pb), (pb),
+MODULE_CALL_HOOK_DECL(compat_10_openat_hook, int, (struct pathbuf **));
+MODULE_CALL_HOOK(compat_10_openat_hook, int, (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.20 src/sys/net/if.c:1.419.2.21
--- src/sys/net/if.c:1.419.2.20 Mon Jan 14 13:34:28 2019
+++ src/sys/net/if.c Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.419.2.20 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: if.c,v 1.419.2.21 2019/01/18 00:01:02 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.20 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.21 2019/01/18 00:01:02 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3120,24 +3120,24 @@ out:
/*
* Interface for calling the compat routines
*/
-MODULE_CALL_INT_HOOK_DECL(uipc_syscalls_40_hook,
+MODULE_CALL_HOOK_DECL(uipc_syscalls_40_hook, int,
(struct lwp *l, int cmd, void *data));
-MODULE_CALL_INT_HOOK(uipc_syscalls_40_hook,
+MODULE_CALL_HOOK(uipc_syscalls_40_hook, int,
(struct lwp *l, int cmd, void *data), (cmd, data), enosys());
-MODULE_CALL_INT_HOOK_DECL(uipc_syscalls_50_hook,
+MODULE_CALL_HOOK_DECL(uipc_syscalls_50_hook, int,
(struct lwp *l, int cmd, void *data));
-MODULE_CALL_INT_HOOK(uipc_syscalls_50_hook,
+MODULE_CALL_HOOK(uipc_syscalls_50_hook, int,
(struct lwp *l, int cmd, void *data), (l, cmd, data), enosys());
-MODULE_CALL_INT_HOOK_DECL(if_43_cvtcmd_hook,
+MODULE_CALL_HOOK_DECL(if_43_cvtcmd_hook, int,
(u_long *ncmd, u_long ocmd));
-MODULE_CALL_INT_HOOK(if_43_cvtcmd_hook,
+MODULE_CALL_HOOK(if_43_cvtcmd_hook, int,
(u_long *ncmd, u_long ocmd), (ncmd, ocmd), enosys());
-MODULE_CALL_INT_HOOK_DECL(if_43_ifioctl_hook,
+MODULE_CALL_HOOK_DECL(if_43_ifioctl_hook, int,
(struct socket *so, u_long ocmd, u_long cmd, void *data, struct lwp *l));
-MODULE_CALL_INT_HOOK(if_43_ifioctl_hook,
+MODULE_CALL_HOOK(if_43_ifioctl_hook, int,
(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.9 src/sys/net/if_spppsubr.c:1.179.2.10
--- src/sys/net/if_spppsubr.c:1.179.2.9 Mon Jan 14 13:34:28 2019
+++ src/sys/net/if_spppsubr.c Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.179.2.9 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.179.2.10 2019/01/18 00:01:02 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.9 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.179.2.10 2019/01/18 00:01:02 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_INT_HOOK_DECL(sppp_params_50_hook,
+MODULE_CALL_HOOK_DECL(sppp_params_50_hook, int,
(struct sppp *sp, u_long cmd, void *data));
-MODULE_CALL_INT_HOOK(sppp_params_50_hook,
+MODULE_CALL_HOOK(sppp_params_50_hook, int,
(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.22 src/sys/net/rtsock.c:1.238.2.23
--- src/sys/net/rtsock.c:1.238.2.22 Tue Jan 15 22:27:07 2019
+++ src/sys/net/rtsock.c Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.238.2.22 2019/01/15 22:27:07 pgoyette Exp $ */
+/* $NetBSD: rtsock.c,v 1.238.2.23 2019/01/18 00:01:02 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.22 2019/01/15 22:27:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.23 2019/01/18 00:01:02 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -106,15 +106,6 @@ static void sysctl_net_route_setup(struc
#include <net/rtsock_shared.c>
/*
- * Compat linkage
- */
-static int stub_70_rt_newaddrmsg1(int cmd, struct ifaddr *ifa)
-{
-
- return 0;
-}
-
-/*
* XXX avoid using void * once msghdr compat disappears.
*/
void
@@ -139,10 +130,10 @@ MODULE_CALL_VOID_HOOK_DECL(rtsock_14_oif
MODULE_CALL_VOID_HOOK(rtsock_14_oifmsg_hook, (struct ifnet *ifp), (ifp),
__nothing);
-MODULE_CALL_INT_HOOK_DECL(rtsock_14_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_14_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
-MODULE_CALL_INT_HOOK(rtsock_14_iflist_hook,
+MODULE_CALL_HOOK(rtsock_14_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
@@ -151,10 +142,10 @@ MODULE_CALL_INT_HOOK(rtsock_14_iflist_ho
/*
* MODULE_HOOK glue for rtsock_50 ifaddr_list and various message routines
*/
-MODULE_CALL_INT_HOOK_DECL(rtsock_50_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
-MODULE_CALL_INT_HOOK(rtsock_50_iflist_hook,
+MODULE_CALL_HOOK(rtsock_50_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len),
(ifp, w, info, len),
@@ -197,11 +188,11 @@ MODULE_CALL_VOID_HOOK(rtsock_50_oifmsg_h
*/
MODULE_CALL_VOID_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
MODULE_CALL_VOID_HOOK(rtsock_70_newaddr_hook, (int cmd, struct ifaddr *ifa),
- (cmd, ifa), stub_70_rt_newaddrmsg1(cmd, ifa));
+ (cmd, ifa), __nothing);
-MODULE_CALL_INT_HOOK_DECL(rtsock_70_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_70_iflist_hook, int,
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
-MODULE_CALL_INT_HOOK(rtsock_70_iflist_hook,
+MODULE_CALL_HOOK(rtsock_70_iflist_hook, int,
(struct rt_walkarg *w, struct ifaddr *ifa, struct rt_addrinfo *info),
(w, ifa, info),
enosys());
Index: src/sys/net/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.1.2.4 src/sys/net/rtsock_shared.c:1.1.2.5
--- src/sys/net/rtsock_shared.c:1.1.2.4 Tue Jan 15 22:28:15 2019
+++ src/sys/net/rtsock_shared.c Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.1.2.4 2019/01/15 22:28:15 pgoyette Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.1.2.5 2019/01/18 00:01:02 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.1.2.4 2019/01/15 22:28:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.1.2.5 2019/01/18 00:01:02 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1301,14 +1301,14 @@ again:
*/
MODULE_CALL_VOID_HOOK_DECL(rtsock_14_oifmsg_hook, (struct ifnet *ifp));
-MODULE_CALL_INT_HOOK_DECL(rtsock_14_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_14_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
/*
* MODULE_HOOK glue for rtsock_50 ifaddr_list and various message routines
*/
-MODULE_CALL_INT_HOOK_DECL(rtsock_50_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
@@ -1334,7 +1334,7 @@ MODULE_CALL_VOID_HOOK_DECL(rtsock_50_oif
*/
MODULE_CALL_VOID_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
-MODULE_CALL_INT_HOOK_DECL(rtsock_70_iflist_hook,
+MODULE_CALL_HOOK_DECL(rtsock_70_iflist_hook, int,
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
/*
Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.60.16.6 src/sys/net80211/ieee80211_ioctl.c:1.60.16.7
--- src/sys/net80211/ieee80211_ioctl.c:1.60.16.6 Mon Jan 14 13:34:28 2019
+++ src/sys/net80211/ieee80211_ioctl.c Fri Jan 18 00:01:02 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.6 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.16.7 2019/01/18 00:01:02 pgoyette Exp $");
#endif
/*
@@ -2559,9 +2559,9 @@ ieee80211_ioctl(struct ieee80211com *ic,
/*
* Compatability glue
*/
-MODULE_CALL_INT_HOOK_DECL(ieee80211_ostats_hook,
+MODULE_CALL_HOOK_DECL(ieee80211_ostats_hook, int,
(struct ieee80211_ostats *ostats, struct ieee80211_stats *stats));
-MODULE_CALL_INT_HOOK(ieee80211_ostats_hook,
+MODULE_CALL_HOOK(ieee80211_ostats_hook, int,
(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.9 src/sys/opencrypto/cryptodev.c:1.98.2.10
--- src/sys/opencrypto/cryptodev.c:1.98.2.9 Mon Jan 14 13:34:28 2019
+++ src/sys/opencrypto/cryptodev.c Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.98.2.9 2019/01/14 13:34:28 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.98.2.10 2019/01/18 00:01:02 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.9 2019/01/14 13:34:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.10 2019/01/18 00:01:02 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_INT_HOOK_DECL(ocryptof_50_hook,
+MODULE_CALL_HOOK_DECL(ocryptof_50_hook, int,
(struct file *fp, u_long cmd, void *data));
-MODULE_CALL_INT_HOOK(ocryptof_50_hook,
+MODULE_CALL_HOOK(ocryptof_50_hook, int,
(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.50 src/sys/sys/compat_stub.h:1.1.2.51
--- src/sys/sys/compat_stub.h:1.1.2.50 Tue Jan 15 12:42:12 2019
+++ src/sys/sys/compat_stub.h Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.50 2019/01/15 12:42:12 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.51 2019/01/18 00:01:02 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -299,8 +299,8 @@ MODULE_HOOK(compat_10_openat_hook, int,
* Hook for compat_70_unp_addsockcred
*/
struct mbuf;
-MODULE_HOOK(compat_70_unp_hook, void,
- (struct mbuf **, struct lwp *, struct mbuf *));
+MODULE_HOOK(compat_70_unp_hook, struct mbuf *,
+ (struct lwp *, struct mbuf *));
/*
* Hook for sysvipc50 sysctl
Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.11 src/sys/sys/module_hook.h:1.1.2.12
--- src/sys/sys/module_hook.h:1.1.2.11 Thu Jan 17 21:32:42 2019
+++ src/sys/sys/module_hook.h Fri Jan 18 00:01:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.11 2019/01/17 21:32:42 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.12 2019/01/18 00:01:02 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -104,20 +104,21 @@ static void (hook ## _unset)(void) \
pserialize_destroy(hook.psz); \
}
-#define MODULE_CALL_INT_HOOK_DECL(hook, decl) \
-int \
+#define MODULE_CALL_HOOK_DECL(hook, type, decl) \
+type \
hook ## _call decl;
#define MODULE_CALL_VOID_HOOK_DECL(hook, decl) \
void \
hook ## _call decl;
-#define MODULE_CALL_INT_HOOK(hook, decl, args, default) \
-int \
+#define MODULE_CALL_HOOK(hook, type, decl, args, default) \
+type \
hook ## _call decl \
{ \
bool __hooked; \
- int __hook_retval, __hook_s; \
+ type __hook_retval; \
+ int __hook_s; \
\
__hook_s = pserialize_read_enter(); \
__hooked = hook.hooked; \
