Module Name:    src
Committed By:   pgoyette
Date:           Mon Apr 16 03:41:34 UTC 2018

Modified Files:
        src/sys/compat/common [pgoyette-compat]: compat_40_mod.c
            compat_50_mod.c compat_mod.h if_40.h uipc_syscalls_40.c
            uipc_syscalls_50.c
        src/sys/compat/sys [pgoyette-compat]: sockio.h

Log Message:
Rename if_[45]0_{init,fini} entry points to more appropriate and more
consistent uipc_syscalls_[45]0_{init,fini} and remove some multiple
declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_40_mod.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.42.18 -r1.1.42.19 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/if_40.h
cvs rdiff -u -r1.15.2.8 -r1.15.2.9 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.3.56.5 -r1.3.56.6 src/sys/compat/common/uipc_syscalls_50.c
cvs rdiff -u -r1.10.58.4 -r1.10.58.5 src/sys/compat/sys/sockio.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/compat/common/compat_40_mod.c
diff -u src/sys/compat/common/compat_40_mod.c:1.1.2.1 src/sys/compat/common/compat_40_mod.c:1.1.2.2
--- src/sys/compat/common/compat_40_mod.c:1.1.2.1	Tue Mar 27 07:29:43 2018
+++ src/sys/compat/common/compat_40_mod.c	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_40_mod.c,v 1.1.2.1 2018/03/27 07:29:43 pgoyette Exp $	*/
+/*	$NetBSD: compat_40_mod.c,v 1.1.2.2 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.1 2018/03/27 07:29:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.2 2018/04/16 03:41:34 pgoyette Exp $");
 
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -56,7 +56,7 @@ compat_40_init(void)
 	error = vfs_syscalls_40_init();
 	if (error != 0)
 		return error;
-	if_40_init();
+	uipc_syscalls_40_init();
 	sysmon_power_40_init();
 
 	return error;
@@ -68,10 +68,10 @@ compat_40_fini(void)
 	int error = 0;
 
 	sysmon_power_40_fini();
-	if_40_fini();
+	uipc_syscalls_40_fini();
 	error = vfs_syscalls_40_fini();
 	if (error != 0) {
-		if_40_init();
+		uipc_syscalls_40_init();
 		sysmon_power_40_init();
 	}
 

Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.7 src/sys/compat/common/compat_50_mod.c:1.1.2.8
--- src/sys/compat/common/compat_50_mod.c:1.1.2.7	Sat Mar 24 23:52:19 2018
+++ src/sys/compat/common/compat_50_mod.c	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_50_mod.c,v 1.1.2.7 2018/03/24 23:52:19 pgoyette Exp $	*/
+/*	$NetBSD: compat_50_mod.c,v 1.1.2.8 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.7 2018/03/24 23:52:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.8 2018/04/16 03:41:34 pgoyette Exp $");
 
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -79,7 +79,7 @@ compat_50_init(void)
 		goto err3;
 
 	uvm_50_init();
-	if_50_init();
+	uipc_syscalls_50_init();
 	clockctl_50_init();
 	if_spppsubr_50_init();
 	cryptodev_50_init();
@@ -112,7 +112,7 @@ compat_50_fini(void)
 	cryptodev_50_fini();
 	if_spppsubr_50_fini();
 	clockctl_50_fini();
-	if_50_fini();
+	uipc_syscalls_50_fini();
 	uvm_50_fini();
 
 	error = vfs_syscalls_50_fini();
@@ -142,7 +142,7 @@ compat_50_fini(void)
 	vfs_syscalls_50_init();
  err1:
 	uvm_50_init();
-	if_50_init();
+	uipc_syscalls_50_init();
 	clockctl_50_init();
 	if_spppsubr_50_init();
 	cryptodev_50_init();

Index: src/sys/compat/common/compat_mod.h
diff -u src/sys/compat/common/compat_mod.h:1.1.42.18 src/sys/compat/common/compat_mod.h:1.1.42.19
--- src/sys/compat/common/compat_mod.h:1.1.42.18	Tue Apr  3 08:29:44 2018
+++ src/sys/compat/common/compat_mod.h	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.h,v 1.1.42.18 2018/04/03 08:29:44 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.h,v 1.1.42.19 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -75,15 +75,15 @@ void uvm_50_init(void);
 void uvm_50_fini(void);
 int vfs_syscalls_50_init(void);
 int vfs_syscalls_50_fini(void);
-void if_50_init(void);
-void if_50_fini(void);
+void uipc_syscalls_50_init(void);
+void uipc_syscalls_50_fini(void);
 #endif
 
 #ifdef COMPAT_40
 int compat_40_init(void);
 int compat_40_fini(void);
-void if_40_init(void);
-void if_40_fini(void);
+void uipc_syscalls_40_init(void);
+void uipc_syscalls_40_fini(void);
 int vfs_syscalls_40_init(void);
 int vfs_syscalls_40_fini(void);
 void sysmon_power_40_init(void);

Index: src/sys/compat/common/if_40.h
diff -u src/sys/compat/common/if_40.h:1.1.2.2 src/sys/compat/common/if_40.h:1.1.2.3
--- src/sys/compat/common/if_40.h:1.1.2.2	Tue Mar  6 23:31:29 2018
+++ src/sys/compat/common/if_40.h	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_40.h,v 1.1.2.2 2018/03/06 23:31:29 pgoyette Exp $	*/
+/*	$NetBSD: if_40.h,v 1.1.2.3 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -41,8 +41,6 @@ extern u_long (*vec_compat_cvtcmd)(u_lon
 extern int (*vec_compat_ifioctl)(struct socket *, u_long, u_long, 
     void *, struct lwp *);
 
-void if_40_init(void);
-void if_40_fini(void);
 #endif
 
 #endif /* !_COMPAT_IF_40_H_ */

Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.15.2.8 src/sys/compat/common/uipc_syscalls_40.c:1.15.2.9
--- src/sys/compat/common/uipc_syscalls_40.c:1.15.2.8	Mon Apr 16 01:59:56 2018
+++ src/sys/compat/common/uipc_syscalls_40.c	Mon Apr 16 03:41:34 2018
@@ -1,9 +1,9 @@
-/*	$NetBSD: uipc_syscalls_40.c,v 1.15.2.8 2018/04/16 01:59:56 pgoyette Exp $	*/
+/*	$NetBSD: uipc_syscalls_40.c,v 1.15.2.9 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /* written by Pavel Cahyna, 2006. Public domain. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.8 2018/04/16 01:59:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.9 2018/04/16 03:41:34 pgoyette Exp $");
 
 /*
  * System call interface to the socket abstraction.
@@ -23,6 +23,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
 #include <compat/sys/sockio.h>
 
 #include <compat/common/if_40.h>
+#include <compat/common/compat_mod.h>
 
 /*
  * Return interface configuration
@@ -162,14 +163,14 @@ release_exit:
 }
 
 void      
-if_40_init(void)
+uipc_syscalls_40_init(void)
 {
  
 	vec_compat_ifconf = compat_ifconf;
 }
  
 void
-if_40_fini(void)
+uipc_syscalls_40_fini(void)
 {
  
 	vec_compat_ifconf = (void *)enosys;

Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.3.56.5 src/sys/compat/common/uipc_syscalls_50.c:1.3.56.6
--- src/sys/compat/common/uipc_syscalls_50.c:1.3.56.5	Mon Apr 16 01:59:56 2018
+++ src/sys/compat/common/uipc_syscalls_50.c	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls_50.c,v 1.3.56.5 2018/04/16 01:59:56 pgoyette Exp $	*/
+/*	$NetBSD: uipc_syscalls_50.c,v 1.3.56.6 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.5 2018/04/16 01:59:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.6 2018/04/16 03:41:34 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
 #include <compat/sys/sockio.h>
 #include <compat/sys/if.h>
 
+#include <compat/common/compat_mod.h>
+
 /*ARGSUSED*/
 static int
 compat_ifdatareq(struct lwp *l, u_long cmd, void *data)
@@ -99,14 +101,14 @@ compat_ifdatareq(struct lwp *l, u_long c
 /* Save and restore compat vector as needed */
 
 void
-if_50_init(void)
+uipc_syscalls_50_init(void)
 {
 
 	vec_compat_ifdatareq = compat_ifdatareq;
 }
 
 void
-if_50_fini(void)
+uipc_syscalls_50_fini(void)
 {
 
 	vec_compat_ifdatareq = (void *)enosys;

Index: src/sys/compat/sys/sockio.h
diff -u src/sys/compat/sys/sockio.h:1.10.58.4 src/sys/compat/sys/sockio.h:1.10.58.5
--- src/sys/compat/sys/sockio.h:1.10.58.4	Mon Apr 16 01:59:57 2018
+++ src/sys/compat/sys/sockio.h	Mon Apr 16 03:41:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sockio.h,v 1.10.58.4 2018/04/16 01:59:57 pgoyette Exp $	*/
+/*	$NetBSD: sockio.h,v 1.10.58.5 2018/04/16 03:41:34 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -181,11 +181,4 @@ struct oifdatareq {
 		    (oi)->ifi_lastchange.tv_usec * 1000; \
 	} while (/*CONSTCOND*/0)
 
-#ifdef _KERNEL
-
-void if_50_init(void);
-void if_50_fini(void);
-
-#endif
-
 #endif /* _COMPAT_SYS_SOCKIO_H_ */

Reply via email to