Source-Changes-HG archive

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

[src/pgoyette-compat]: src/sys The COMPAT_HOOK macros were renamed to MODULE_...



details:   https://anonhg.NetBSD.org/src/rev/be1994d84159
branches:  pgoyette-compat
changeset: 830725:be1994d84159
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Sep 18 23:03:54 2018 +0000

description:
The COMPAT_HOOK macros were renamed to MODULE_HOOK, adjust all callers

diffstat:

 sys/compat/common/bio_30.c               |   8 +++---
 sys/compat/common/ccd_60.c               |   8 +++---
 sys/compat/common/clockctl_50.c          |   8 +++---
 sys/compat/common/if_43.c                |  10 ++++----
 sys/compat/common/if_spppsubr50.c        |   8 +++---
 sys/compat/common/kern_mod_80.c          |   8 +++---
 sys/compat/common/rtsock_14.c            |   8 +++---
 sys/compat/common/sysmon_power_40.c      |   8 +++---
 sys/compat/common/usb_subr_30.c          |   8 +++---
 sys/compat/common/vnd_30.c               |   8 +++---
 sys/compat/netbsd32/netbsd32.h           |   6 ++--
 sys/compat/netbsd32/netbsd32_compat_80.c |   8 +++---
 sys/compat/netbsd32/netbsd32_mod.c       |   6 ++--
 sys/compat/netbsd32/netbsd32_module.c    |   8 +++---
 sys/dev/bio.c                            |   8 +++---
 sys/dev/ccd.c                            |   8 +++---
 sys/dev/clockctl.c                       |   8 +++---
 sys/dev/raidframe/rf_compat50.c          |   6 ++--
 sys/dev/raidframe/rf_compat80.c          |   6 ++--
 sys/dev/raidframe/rf_netbsdkintf.c       |  12 +++++-----
 sys/dev/sysmon/sysmon_power.c            |   8 +++---
 sys/dev/usb/ugen.c                       |   6 ++--
 sys/dev/usb/uhid.c                       |   6 ++--
 sys/dev/usb/usb.c                        |  12 +++++-----
 sys/dev/vnd.c                            |   8 +++---
 sys/dev/wscons/wsevent.c                 |   8 +++---
 sys/dev/wscons/wsevent_50.c              |   8 +++---
 sys/fs/puffs/puffs_compat.c              |   8 +++---
 sys/fs/puffs/puffs_msgif.c               |  12 +++++-----
 sys/kern/sys_module.c                    |  10 ++++----
 sys/net/if_spppsubr.c                    |   8 +++---
 sys/net/rtsock.c                         |  14 ++++++------
 sys/opencrypto/cryptodev.c               |   8 +++---
 sys/opencrypto/ocryptodev.c              |   8 +++---
 sys/sys/compat_stub.h                    |  36 ++++++++++++++++----------------
 35 files changed, 159 insertions(+), 159 deletions(-)

diffs (truncated from 1200 to 300 lines):

diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/bio_30.c
--- a/sys/compat/common/bio_30.c        Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/bio_30.c        Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bio_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/*     $NetBSD: bio_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */
 /*     $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $   */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -88,8 +88,8 @@
        }
 }
 
-COMPAT_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
-COMPAT_UNSET_HOOK(compat_bio_30_hook);
+MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
+MODULE_UNSET_HOOK(compat_bio_30_hook);
 
 void
 bio_30_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/ccd_60.c
--- a/sys/compat/common/ccd_60.c        Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/ccd_60.c        Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccd_60.c,v 1.1.2.7 2018/09/16 04:57:22 pgoyette Exp $  */
+/*     $NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $  */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.7 2018/09/16 04:57:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -91,8 +91,8 @@
        }
 }
 
-COMPAT_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
-COMPAT_UNSET_HOOK(ccd_ioctl_60_hook);
+MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
+MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
 
 void
 ccd_60_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/clockctl_50.c
--- a/sys/compat/common/clockctl_50.c   Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/clockctl_50.c   Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockctl_50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/*      $NetBSD: clockctl_50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,8 +122,8 @@
        return (error);
 }
 
-COMPAT_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
-COMPAT_UNSET_HOOK(clockctl_ioctl_50_hook);
+MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
+MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
 
 void
 clockctl_50_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/if_43.c Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_43.c,v 1.14.2.3 2018/09/18 01:15:57 pgoyette Exp $  */
+/*     $NetBSD: if_43.c,v 1.14.2.4 2018/09/18 23:03:54 pgoyette Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.3 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.4 2018/09/18 23:03:54 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -77,9 +77,9 @@
 #include <compat/common/if_43.h>
 #include <uvm/uvm_extern.h>
 
-/* COMPAT_HOOK for replacing the cmdcvt() function */
-COMPAT_CALL_HOOK_DECL(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
-COMPAT_CALL_HOOK(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
+/* MODULE_HOOK for replacing the cmdcvt() function */
+MODULE_CALL_HOOK_DECL(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
+MODULE_CALL_HOOK(ieee80211_get_ostats_20_hook, f, (int cmd), (cmd), cmd);
 
 u_long 
 compat_cvtcmd(u_long cmd)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/if_spppsubr50.c
--- a/sys/compat/common/if_spppsubr50.c Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/if_spppsubr50.c Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $    */
+/*     $NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $    */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr50.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -154,8 +154,8 @@
        return 0;
 }
 
-COMPAT_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
-COMPAT_UNSET_HOOK(sppp_params_50_hook);
+MODULE_SET_HOOK(sppp_params_50_hook, "sppp60", sppp_compat50_params);
+MODULE_UNSET_HOOK(sppp_params_50_hook);
 
 void
 if_spppsubr_50_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/kern_mod_80.c
--- a/sys/compat/common/kern_mod_80.c   Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/kern_mod_80.c   Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_mod_80.c,v 1.1.2.5 2018/09/17 11:04:30 pgoyette Exp $     */
+/*     $NetBSD: kern_mod_80.c,v 1.1.2.6 2018/09/18 23:03:54 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.5 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mod_80.c,v 1.1.2.6 2018/09/18 23:03:54 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -151,8 +151,8 @@
        return error;
 }
 
-COMPAT_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
-COMPAT_UNSET_HOOK(compat_modstat_80_hook);
+MODULE_SET_HOOK(compat_modstat_80_hook, "mod_80",compat_80_modstat);
+MODULE_UNSET_HOOK(compat_modstat_80_hook);
 
 void
 kern_mod_80_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/rtsock_14.c
--- a/sys/compat/common/rtsock_14.c     Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/rtsock_14.c     Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock_14.c,v 1.5.14.2 2018/09/17 11:04:30 pgoyette Exp $      */
+/*     $NetBSD: rtsock_14.c,v 1.5.14.3 2018/09/18 23:03:54 pgoyette Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.5.14.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.5.14.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -170,9 +170,9 @@
        return 0;
 }
 
-COMPAT_SET_HOOK2(rtsock14_hook, "rts_14", compat_14_rt_oifmsg,
+MODULE_SET_HOOK2(rtsock14_hook, "rts_14", compat_14_rt_oifmsg,
     compat_14_iflist);
-COMPAT_UNSET_HOOK2(rtsock14_hook);
+MODULE_UNSET_HOOK2(rtsock14_hook);
 
 void
 rtsock_14_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/sysmon_power_40.c
--- a/sys/compat/common/sysmon_power_40.c       Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/sysmon_power_40.c       Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysmon_power_40.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $ */
+/*     $NetBSD: sysmon_power_40.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2007 Juan Romero Pardines.
@@ -62,7 +62,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power_40.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,8 +89,8 @@
        return 0;
 }
 
-COMPAT_SET_HOOK(compat_sysmon_power_40_hook, "smon60", compat_40_sysmon_power);
-COMPAT_UNSET_HOOK(compat_sysmon_power_40_hook);
+MODULE_SET_HOOK(compat_sysmon_power_40_hook, "smon60", compat_40_sysmon_power);
+MODULE_UNSET_HOOK(compat_sysmon_power_40_hook);
  
 void
 sysmon_power_40_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/usb_subr_30.c
--- a/sys/compat/common/usb_subr_30.c   Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/usb_subr_30.c   Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb_subr_30.c,v 1.1.2.2 2018/09/18 01:15:57 pgoyette Exp $     */
+/*     $NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $     */
 /*     $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $   */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.2 2018/09/18 01:15:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -229,9 +229,9 @@
        return 0;
 }
 
-COMPAT_SET_HOOK2(usb_subr_30_hook, "usb_30", usbd_fill_deviceinfo_old,
+MODULE_SET_HOOK2(usb_subr_30_hook, "usb_30", usbd_fill_deviceinfo_old,
     usb_copy_to_old30);
-COMPAT_UNSET_HOOK2(usb_subr_30_hook);
+MODULE_UNSET_HOOK2(usb_subr_30_hook);
 
 void
 usb_30_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/common/vnd_30.c
--- a/sys/compat/common/vnd_30.c        Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/common/vnd_30.c        Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnd_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $  */
+/*     $NetBSD: vnd_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.1.2.2 2018/09/17 11:04:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -115,8 +115,8 @@
        return 0;
 }
 
-COMPAT_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
-COMPAT_UNSET_HOOK(compat_vndioctl_30_hook);
+MODULE_SET_HOOK(compat_vndioctl_30_hook, "vnd_30", compat_30_vndioctl);
+MODULE_UNSET_HOOK(compat_vndioctl_30_hook);
 
 void
 vnd_30_init(void)
diff -r 7fa43e7ddf74 -r be1994d84159 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h    Tue Sep 18 21:38:08 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32.h    Tue Sep 18 23:03:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32.h,v 1.116.2.8 2018/09/18 10:35:04 pgoyette Exp $      */
+/*     $NetBSD: netbsd32.h,v 1.116.2.9 2018/09/18 23:03:54 pgoyette Exp $      */



Home | Main Index | Thread Index | Old Index