Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Normalize all the compat hooks' names to the form



details:   https://anonhg.NetBSD.org/src/rev/a0f142954ab4
branches:  trunk
changeset: 838727:a0f142954ab4
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Jan 29 09:28:50 2019 +0000

description:
Normalize all the compat hooks' names to the form

        <subsystem>_<function>_<version>_hook

NFCI

XXX Note that although this introduces a change in the kernel-to-
XXX module interface, we are NOT bumping the kernel version number.
XXX We will bump the version number once the interface stabilizes.

diffstat:

 sys/compat/common/compat_sysv_50_mod.c   |   8 ++--
 sys/compat/common/ieee80211_20.c         |   8 ++--
 sys/compat/common/if_43.c                |  12 +++---
 sys/compat/common/rtsock_14.c            |  12 +++---
 sys/compat/common/rtsock_50.c            |  32 ++++++++--------
 sys/compat/common/rtsock_70.c            |  12 +++---
 sys/compat/common/tty_43.c               |   8 ++--
 sys/compat/common/tty_60.c               |  12 +++---
 sys/compat/common/uipc_usrreq_70.c       |   8 ++--
 sys/compat/common/usb_subr_30.c          |  12 +++---
 sys/compat/common/vfs_syscalls_10.c      |   8 ++--
 sys/compat/netbsd32/netbsd32_compat_50.c |   8 ++--
 sys/compat/netbsd32/netbsd32_kern_proc.c |  12 +++---
 sys/dev/raidframe/rf_compat50.c          |   6 +-
 sys/dev/raidframe/rf_compat80.c          |   6 +-
 sys/dev/raidframe/rf_netbsdkintf.c       |   8 ++--
 sys/dev/usb/ugen.c                       |   6 +-
 sys/dev/usb/uhid.c                       |   6 +-
 sys/dev/usb/usb.c                        |   8 ++--
 sys/dev/wscons/wsevent.c                 |   6 +-
 sys/dev/wscons/wsevent_50.c              |   8 ++--
 sys/fs/puffs/puffs_compat.c              |  12 +++---
 sys/fs/puffs/puffs_msgif.c               |   8 ++--
 sys/kern/compat_stub.c                   |  62 ++++++++++++++++----------------
 sys/kern/kern_proc.c                     |   8 ++--
 sys/kern/kern_rndq.c                     |   6 +-
 sys/kern/sysv_ipc.c                      |   6 +-
 sys/kern/tty.c                           |   8 ++--
 sys/kern/tty_ptm.c                       |   6 +-
 sys/kern/uipc_usrreq.c                   |   8 ++--
 sys/kern/vfs_syscalls.c                  |   7 +--
 sys/net/if.c                             |  10 ++--
 sys/net/rtsock.c                         |  12 +++---
 sys/net/rtsock_shared.c                  |  18 ++++----
 sys/net80211/ieee80211_ioctl.c           |   4 +-
 sys/sys/compat_stub.h                    |  62 ++++++++++++++++----------------
 36 files changed, 221 insertions(+), 222 deletions(-)

diffs (truncated from 1553 to 300 lines):

diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/compat_sysv_50_mod.c
--- a/sys/compat/common/compat_sysv_50_mod.c    Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/compat_sysv_50_mod.c    Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_sysv_50_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $  */
+/*     $NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $  */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -75,7 +75,7 @@
                if (error != 0) {
                        break;
                }
-               MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50",
+               MODULE_SET_HOOK(sysvipc_sysctl_50_hook, "sysv50",
                    sysctl_kern_sysvipc50);
                break;
 
@@ -84,7 +84,7 @@
                if (error != 0) {
                        break;
                }
-               MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
+               MODULE_UNSET_HOOK(sysvipc_sysctl_50_hook);
                break;
 
        default:
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/ieee80211_20.c
--- a/sys/compat/common/ieee80211_20.c  Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/ieee80211_20.c  Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_20.c,v 1.3 2019/01/28 21:13:58 christos Exp $        */
+/*     $NetBSD: ieee80211_20.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $        */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.3 2019/01/28 21:13:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $");
 #endif
 
 /*
@@ -119,12 +119,12 @@
 ieee80211_20_init(void)
 {
 
-       MODULE_SET_HOOK(ieee80211_20_ioctl_hook, "ieee20", ieee80211_20_ioctl);
+       MODULE_SET_HOOK(ieee80211_ioctl_20_hook, "ieee20", ieee80211_20_ioctl);
 }
 
 void
 ieee80211_20_fini(void)
 {
 
-       MODULE_UNSET_HOOK(ieee80211_20_ioctl_hook);
+       MODULE_UNSET_HOOK(ieee80211_ioctl_20_hook);
 }
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/if_43.c Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_43.c,v 1.18 2019/01/29 04:10:10 pgoyette Exp $      */
+/*     $NetBSD: if_43.c,v 1.19 2019/01/29 09:28:50 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.18 2019/01/29 04:10:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.19 2019/01/29 09:28:50 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -299,8 +299,8 @@
 if_43_init(void)
 {
 
-       MODULE_SET_HOOK(if_43_cvtcmd_hook, "if_43", do_compat_cvtcmd);
-       MODULE_SET_HOOK(if_43_ifioctl_hook, "if_43", compat_ifioctl);
+       MODULE_SET_HOOK(if_cvtcmd_43_hook, "if_43", do_compat_cvtcmd);
+       MODULE_SET_HOOK(if_ifioctl_43_hook, "if_43", compat_ifioctl);
        return 0;
 }
 
@@ -308,8 +308,8 @@
 if_43_fini(void)
 {
 
-       MODULE_UNSET_HOOK(if_43_cvtcmd_hook);
-       MODULE_UNSET_HOOK(if_43_ifioctl_hook);
+       MODULE_UNSET_HOOK(if_cvtcmd_43_hook);
+       MODULE_UNSET_HOOK(if_ifioctl_43_hook);
        return 0;
 }
 #endif /* defined(COMPAT_43) */
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/rtsock_14.c
--- a/sys/compat/common/rtsock_14.c     Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/rtsock_14.c     Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock_14.c,v 1.6 2019/01/27 02:08:39 pgoyette Exp $   */
+/*     $NetBSD: rtsock_14.c,v 1.7 2019/01/29 09:28:50 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.6 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -177,14 +177,14 @@
 rtsock_14_init(void)
 {
 
-       MODULE_SET_HOOK(rtsock_14_oifmsg_hook, "rts_14", compat_14_rt_oifmsg);
-       MODULE_SET_HOOK(rtsock_14_iflist_hook, "rts_14", compat_14_iflist);
+       MODULE_SET_HOOK(rtsock_oifmsg_14_hook, "rts_14", compat_14_rt_oifmsg);
+       MODULE_SET_HOOK(rtsock_iflist_14_hook, "rts_14", compat_14_iflist);
 }
 
 void
 rtsock_14_fini(void)
 {
 
-       MODULE_UNSET_HOOK(rtsock_14_oifmsg_hook);
-       MODULE_UNSET_HOOK(rtsock_14_iflist_hook);
+       MODULE_UNSET_HOOK(rtsock_oifmsg_14_hook);
+       MODULE_UNSET_HOOK(rtsock_iflist_14_hook);
 }
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/rtsock_50.c
--- a/sys/compat/common/rtsock_50.c     Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/rtsock_50.c     Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock_50.c,v 1.8 2019/01/27 02:08:39 pgoyette Exp $   */
+/*     $NetBSD: rtsock_50.c,v 1.9 2019/01/29 09:28:50 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.8 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.9 2019/01/29 09:28:50 pgoyette Exp $");
 
 #define        COMPAT_RTSOCK   /* Use the COMPATNAME/COMPATCALL macros and the
                         * various other compat definitions - see
@@ -153,16 +153,16 @@
 rtsock_50_init(void)
 {
  
-       MODULE_SET_HOOK(rtsock_50_iflist_hook, "rts_50", compat_50_iflist);
-       MODULE_SET_HOOK(rtsock_50_oifmsg_hook, "rts_50", compat_50_rt_oifmsg);
-       MODULE_SET_HOOK(rtsock_50_rt_missmsg_hook, "rts_50",
+       MODULE_SET_HOOK(rtsock_iflist_50_hook, "rts_50", compat_50_iflist);
+       MODULE_SET_HOOK(rtsock_oifmsg_50_hook, "rts_50", compat_50_rt_oifmsg);
+       MODULE_SET_HOOK(rtsock_rt_missmsg_50_hook, "rts_50",
            compat_50_rt_missmsg);
-       MODULE_SET_HOOK(rtsock_50_rt_ifmsg_hook, "rts_50", compat_50_rt_ifmsg);
-       MODULE_SET_HOOK(rtsock_50_rt_newaddrmsg_hook, "rts_50",
+       MODULE_SET_HOOK(rtsock_rt_ifmsg_50_hook, "rts_50", compat_50_rt_ifmsg);
+       MODULE_SET_HOOK(rtsock_rt_newaddrmsg_50_hook, "rts_50",
            compat_50_rt_newaddrmsg);
-       MODULE_SET_HOOK(rtsock_50_rt_ifannouncemsg_hook, "rts_50",
+       MODULE_SET_HOOK(rtsock_rt_ifannouncemsg_50_hook, "rts_50",
            compat_50_rt_ifannouncemsg);
-       MODULE_SET_HOOK(rtsock_50_rt_ieee80211msg_hook, "rts_50",
+       MODULE_SET_HOOK(rtsock_rt_ieee80211msg_50_hook, "rts_50",
            compat_50_rt_ieee80211msg);
 }
  
@@ -170,11 +170,11 @@
 rtsock_50_fini(void)
 {  
 
-       MODULE_UNSET_HOOK(rtsock_50_iflist_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_oifmsg_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_rt_missmsg_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_rt_ifmsg_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_rt_newaddrmsg_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_rt_ifannouncemsg_hook); 
-       MODULE_UNSET_HOOK(rtsock_50_rt_ieee80211msg_hook); 
+       MODULE_UNSET_HOOK(rtsock_iflist_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_oifmsg_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_rt_missmsg_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_rt_ifmsg_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_rt_newaddrmsg_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_rt_ifannouncemsg_50_hook); 
+       MODULE_UNSET_HOOK(rtsock_rt_ieee80211msg_50_hook); 
 }
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/rtsock_70.c
--- a/sys/compat/common/rtsock_70.c     Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/rtsock_70.c     Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock_70.c,v 1.3 2019/01/27 02:08:39 pgoyette Exp $   */
+/*     $NetBSD: rtsock_70.c,v 1.4 2019/01/29 09:28:50 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.3 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -119,15 +119,15 @@
 rtsock_70_init(void)
 {
 
-       MODULE_SET_HOOK(rtsock_70_newaddr_hook, "rts_70",
+       MODULE_SET_HOOK(rtsock_newaddr_70_hook, "rts_70",
            compat_70_rt_newaddrmsg1);
-       MODULE_SET_HOOK(rtsock_70_iflist_hook, "rts_70", compat_70_iflist_addr);
+       MODULE_SET_HOOK(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
 }
 
 void
 rtsock_70_fini(void)
 {
 
-       MODULE_UNSET_HOOK(rtsock_70_newaddr_hook);
-       MODULE_UNSET_HOOK(rtsock_70_iflist_hook);
+       MODULE_UNSET_HOOK(rtsock_newaddr_70_hook);
+       MODULE_UNSET_HOOK(rtsock_iflist_70_hook);
 }
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/tty_43.c
--- a/sys/compat/common/tty_43.c        Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/tty_43.c        Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty_43.c,v 1.32 2019/01/28 15:46:49 christos Exp $     */
+/*     $NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.32 2019/01/28 15:46:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -518,13 +518,13 @@
 int
 kern_tty_43_init(void)
 {
-       MODULE_SET_HOOK(compat_43_ttioctl_hook, "tty_43", compat_43_ttioctl);
+       MODULE_SET_HOOK(tty_ttioctl_43_hook, "tty_43", compat_43_ttioctl);
        return 0;
 }
 
 int
 kern_tty_43_fini(void)
 {
-       MODULE_UNSET_HOOK(compat_43_ttioctl_hook);
+       MODULE_UNSET_HOOK(tty_ttioctl_43_hook);
        return 0;
 }
diff -r 042a2304875b -r a0f142954ab4 sys/compat/common/tty_60.c
--- a/sys/compat/common/tty_60.c        Tue Jan 29 09:25:52 2019 +0000
+++ b/sys/compat/common/tty_60.c        Tue Jan 29 09:28:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty_60.c,v 1.6 2019/01/28 15:46:49 christos Exp $      */
+/*     $NetBSD: tty_60.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $      */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.6 2019/01/28 15:46:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -123,13 +123,13 @@
 kern_tty_60_init(void)
 {



Home | Main Index | Thread Index | Old Index