Module Name: src
Committed By: pgoyette
Date: Mon Jan 21 06:49:28 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
src/sys/fs/puffs [pgoyette-compat]: puffs_msgif.c
src/sys/kern [pgoyette-compat]: kern_proc.c
src/sys/net [pgoyette-compat]: rtsock.c rtsock_shared.c
src/sys/sys [pgoyette-compat]: module_hook.h
Log Message:
No need to declare the hook_call() function for void hooks. So
remove and simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.14 -r1.115.2.15 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.10 -r1.15.2.11 \
src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.110.14.3 -r1.110.14.4 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.58.2.7 -r1.58.2.8 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.101.10.9 -r1.101.10.10 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.209.2.13 -r1.209.2.14 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.238.2.23 -r1.238.2.24 src/sys/net/rtsock.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 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.14 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.15
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.14 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Mon Jan 21 06:49:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.14 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.15 2019/01/21 06:49:27 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.14 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.15 2019/01/21 06:49:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -275,7 +275,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, void,
(const ksiginfo_t *ksi, const sigset_t *mask));
MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.10 src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.11
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.15.2.10 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Mon Jan 21 06:49:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.15.2.10 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.15.2.11 2019/01/21 06:49:27 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.10 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.11 2019/01/21 06:49:27 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -309,7 +309,7 @@ cpu_coredump32(struct lwp *l, struct cor
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, void,
(const ksiginfo_t *ksi, const sigset_t *mask));
MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.3 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.4
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.14.3 Mon Jan 14 13:34:26 2019
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Mon Jan 21 06:49:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.110.14.3 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.110.14.4 2019/01/21 06:49:27 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.3 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.14.4 2019/01/21 06:49:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -262,7 +262,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
-MODULE_CALL_VOID_HOOK_DECL(netbsd32_sendsig_hook,
+MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, void,
(const ksiginfo_t *ksi, const sigset_t *mask));
MODULE_CALL_VOID_HOOK(netbsd32_sendsig_hook,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.58.2.7 src/sys/dev/sysmon/sysmon_power.c:1.58.2.8
--- src/sys/dev/sysmon/sysmon_power.c:1.58.2.7 Mon Jan 14 13:34:27 2019
+++ src/sys/dev/sysmon/sysmon_power.c Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.58.2.7 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.58.2.8 2019/01/21 06:49:28 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.7 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.8 2019/01/21 06:49:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -318,7 +318,7 @@ sysmon_power_event_queue_flush(void)
/*
* Call the compat hook function
*/
-MODULE_CALL_VOID_HOOK_DECL(compat_sysmon_power_40_hook,
+MODULE_CALL_HOOK_DECL(compat_sysmon_power_40_hook, void,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event));
MODULE_CALL_VOID_HOOK(compat_sysmon_power_40_hook,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.101.10.9 src/sys/fs/puffs/puffs_msgif.c:1.101.10.10
--- src/sys/fs/puffs/puffs_msgif.c:1.101.10.9 Fri Jan 18 00:01:01 2019
+++ src/sys/fs/puffs/puffs_msgif.c Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.101.10.9 2019/01/18 00:01:01 pgoyette Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.101.10.10 2019/01/21 06:49: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.9 2019/01/18 00:01:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.101.10.10 2019/01/21 06:49:28 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -332,7 +332,7 @@ MODULE_CALL_HOOK(puffs_50_out_hook, int,
(oreq, creqp, deltap), enosys());
/* Incoming */
-MODULE_CALL_VOID_HOOK_DECL(puffs_50_in_hook,
+MODULE_CALL_HOOK_DECL(puffs_50_in_hook, void,
(struct puffs_req *oreq, struct puffs_req *creqp));
MODULE_CALL_VOID_HOOK(puffs_50_in_hook,
(struct puffs_req *oreq, struct puffs_req *creqp),
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.13 src/sys/kern/kern_proc.c:1.209.2.14
--- src/sys/kern/kern_proc.c:1.209.2.13 Fri Jan 18 00:01:01 2019
+++ src/sys/kern/kern_proc.c Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.209.2.13 2019/01/18 00:01:01 pgoyette Exp $ */
+/* $NetBSD: kern_proc.c,v 1.209.2.14 2019/01/21 06:49: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.13 2019/01/18 00:01:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.14 2019/01/21 06:49:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1901,7 +1901,7 @@ MODULE_CALL_HOOK_DECL(kern_proc_32_copyi
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,
+MODULE_CALL_HOOK_DECL(kern_proc_32_base_hook, void,
(char **argv, size_t i, vaddr_t *base));
MODULE_CALL_VOID_HOOK(kern_proc_32_base_hook,
(char **argv, size_t i, vaddr_t *base), (argv, i, base), __nothing);
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.238.2.23 src/sys/net/rtsock.c:1.238.2.24
--- src/sys/net/rtsock.c:1.238.2.23 Fri Jan 18 00:01:02 2019
+++ src/sys/net/rtsock.c Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.238.2.23 2019/01/18 00:01:02 pgoyette Exp $ */
+/* $NetBSD: rtsock.c,v 1.238.2.24 2019/01/21 06:49: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.23 2019/01/18 00:01:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.24 2019/01/21 06:49:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -126,7 +126,7 @@ rt_msg3(int type, struct rt_addrinfo *rt
/*
* MODULE_HOOK glue for rtsock_14_oifmsg and rtsock_14_iflist
*/
-MODULE_CALL_VOID_HOOK_DECL(rtsock_14_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_HOOK_DECL(rtsock_14_oifmsg_hook, void, (struct ifnet *ifp));
MODULE_CALL_VOID_HOOK(rtsock_14_oifmsg_hook, (struct ifnet *ifp), (ifp),
__nothing);
@@ -151,34 +151,34 @@ MODULE_CALL_HOOK(rtsock_50_iflist_hook,
(ifp, w, info, len),
enosys());
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_missmsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_missmsg_hook, void,
(int, const struct rt_addrinfo *, int, int));
MODULE_CALL_VOID_HOOK(rtsock_50_rt_missmsg_hook,
(int type, const struct rt_addrinfo *rtinfo, int flags, int error),
(type, rtinfo, flags, error), __nothing);
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifmsg_hook, (struct ifnet *));
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifmsg_hook, void, (struct ifnet *));
MODULE_CALL_VOID_HOOK(rtsock_50_rt_ifmsg_hook, (struct ifnet *ifp), (ifp),
__nothing);
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook, void,
(int, struct ifaddr *, int, struct rtentry *));
MODULE_CALL_VOID_HOOK(rtsock_50_rt_newaddrmsg_hook,
(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt),
(cmd, ifa, error, rt), __nothing);
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook, void,
(struct ifnet *, int what));
MODULE_CALL_VOID_HOOK(rtsock_50_rt_ifannouncemsg_hook,
(struct ifnet *ifp, int what), (ifp, what), __nothing);
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook, void,
(struct ifnet *, int, void *, size_t));
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), __nothing);
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_HOOK_DECL(rtsock_50_oifmsg_hook, void, (struct ifnet *ifp));
MODULE_CALL_VOID_HOOK(rtsock_50_oifmsg_hook, (struct ifnet *ifp), (ifp),
__nothing);
@@ -186,7 +186,7 @@ MODULE_CALL_VOID_HOOK(rtsock_50_oifmsg_h
* MODULE_HOOK glue for rtsock70_newaddrmsg1, rtsock70_ifaddr_listaddr,
* and rtsock70_ifaddr_listif
*/
-MODULE_CALL_VOID_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
+MODULE_CALL_HOOK_DECL(rtsock_70_newaddr_hook, void, (int, struct ifaddr *));
MODULE_CALL_VOID_HOOK(rtsock_70_newaddr_hook, (int cmd, struct ifaddr *ifa),
(cmd, ifa), __nothing);
Index: src/sys/net/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.1.2.5 src/sys/net/rtsock_shared.c:1.1.2.6
--- src/sys/net/rtsock_shared.c:1.1.2.5 Fri Jan 18 00:01:02 2019
+++ src/sys/net/rtsock_shared.c Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_shared.c,v 1.1.2.5 2019/01/18 00:01:02 pgoyette Exp $ */
+/* $NetBSD: rtsock_shared.c,v 1.1.2.6 2019/01/21 06:49: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_shared.c,v 1.1.2.5 2019/01/18 00:01:02 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.1.2.6 2019/01/21 06:49:28 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1299,7 +1299,7 @@ again:
/*
* MODULE_HOOK glue for rtsock_14_oifmsg and rtsock_14_iflist
*/
-MODULE_CALL_VOID_HOOK_DECL(rtsock_14_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_HOOK_DECL(rtsock_14_oifmsg_hook, void, (struct ifnet *ifp));
MODULE_CALL_HOOK_DECL(rtsock_14_iflist_hook, int,
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
@@ -1312,27 +1312,27 @@ MODULE_CALL_HOOK_DECL(rtsock_50_iflist_h
(struct ifnet *ifp, struct rt_walkarg *w, struct rt_addrinfo *info,
size_t len));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_missmsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_missmsg_hook, void,
(int, const struct rt_addrinfo *, int, int));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifmsg_hook, (struct ifnet *));
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifmsg_hook, void, (struct ifnet *));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_newaddrmsg_hook, void,
(int, struct ifaddr *, int, struct rtentry *));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ifannouncemsg_hook, void,
(struct ifnet *, int what));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook,
+MODULE_CALL_HOOK_DECL(rtsock_50_rt_ieee80211msg_hook, void,
(struct ifnet *, int, void *, size_t));
-MODULE_CALL_VOID_HOOK_DECL(rtsock_50_oifmsg_hook, (struct ifnet *ifp));
+MODULE_CALL_HOOK_DECL(rtsock_50_oifmsg_hook, void, (struct ifnet *ifp));
/*
* MODULE_HOOK glue for rtsock70_newaddrmsg1, rtsock70_ifaddr_listaddr,
* and rtsock70_ifaddr_listif
*/
-MODULE_CALL_VOID_HOOK_DECL(rtsock_70_newaddr_hook, (int, struct ifaddr *));
+MODULE_CALL_HOOK_DECL(rtsock_70_newaddr_hook, void, (int, struct ifaddr *));
MODULE_CALL_HOOK_DECL(rtsock_70_iflist_hook, int,
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.12 src/sys/sys/module_hook.h:1.1.2.13
--- src/sys/sys/module_hook.h:1.1.2.12 Fri Jan 18 00:01:02 2019
+++ src/sys/sys/module_hook.h Mon Jan 21 06:49:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.12 2019/01/18 00:01:02 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.13 2019/01/21 06:49:28 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -108,10 +108,6 @@ static void (hook ## _unset)(void) \
type \
hook ## _call decl;
-#define MODULE_CALL_VOID_HOOK_DECL(hook, decl) \
-void \
-hook ## _call decl;
-
#define MODULE_CALL_HOOK(hook, type, decl, args, default) \
type \
hook ## _call decl \
