Module Name: src
Committed By: pgoyette
Date: Sat Mar 10 02:20:13 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: sysv_ipc_50.c sysv_mod.c
sysv_mod.h
Log Message:
Put declaration of the 5.0 sysctl routine in a header file
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/compat/common/sysv_ipc_50.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/sysv_mod.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/sysv_mod.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/sysv_ipc_50.c
diff -u src/sys/compat/common/sysv_ipc_50.c:1.4 src/sys/compat/common/sysv_ipc_50.c:1.4.16.1
--- src/sys/compat/common/sysv_ipc_50.c:1.4 Thu Dec 3 00:28:55 2015
+++ src/sys/compat/common/sysv_ipc_50.c Sat Mar 10 02:20:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_ipc_50.c,v 1.4 2015/12/03 00:28:55 pgoyette Exp $ */
+/* $NetBSD: sysv_ipc_50.c,v 1.4.16.1 2018/03/10 02:20:13 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_ipc_50.c,v 1.4 2015/12/03 00:28:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc_50.c,v 1.4.16.1 2018/03/10 02:20:13 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: sysv_ipc_50.
#include <sys/sysctl.h>
#include <sys/kauth.h>
-#ifdef COMPAT_50
#include <compat/sys/ipc.h>
#ifdef SYSVMSG
#include <compat/sys/msg.h>
@@ -74,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: sysv_ipc_50.
* Check for ipc permission
*/
-int sysctl_kern_sysvipc50(SYSCTLFN_PROTO);
-
int
sysctl_kern_sysvipc50(SYSCTLFN_ARGS)
{
@@ -215,4 +212,3 @@ sysctl_kern_sysvipc50(SYSCTLFN_ARGS)
free(bf, M_TEMP);
return error;
}
-#endif /* COMPAT_50 */
Index: src/sys/compat/common/sysv_mod.c
diff -u src/sys/compat/common/sysv_mod.c:1.1.2.6 src/sys/compat/common/sysv_mod.c:1.1.2.7
--- src/sys/compat/common/sysv_mod.c:1.1.2.6 Fri Mar 9 09:37:01 2018
+++ src/sys/compat/common/sysv_mod.c Sat Mar 10 02:20:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 pgoyette Exp $ */
+/* $NetBSD: sysv_mod.c,v 1.1.2.7 2018/03/10 02:20:13 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v 1.1.2.7 2018/03/10 02:20:13 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -46,10 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v
#include <compat/common/sysv_mod.h>
-#ifdef COMPAT_50
-int sysctl_kern_sysvipc50(SYSCTLFN_PROTO);
-#endif
-
MODULE(MODULE_CLASS_EXEC, compat_sysv, "sysv_ipc");
/* Build the syscall package based on options specified */
Index: src/sys/compat/common/sysv_mod.h
diff -u src/sys/compat/common/sysv_mod.h:1.1.2.2 src/sys/compat/common/sysv_mod.h:1.1.2.3
--- src/sys/compat/common/sysv_mod.h:1.1.2.2 Fri Mar 9 10:41:05 2018
+++ src/sys/compat/common/sysv_mod.h Sat Mar 10 02:20:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_mod.h,v 1.1.2.2 2018/03/09 10:41:05 pgoyette Exp $ */
+/* $NetBSD: sysv_mod.h,v 1.1.2.3 2018/03/10 02:20:13 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -36,4 +36,6 @@
extern int (*vec_sysvipc50_sysctl)(SYSCTLFN_PROTO);
+int sysctl_kern_sysvipc50(SYSCTLFN_PROTO);
+
#endif /* _COMPAT_COMMON_SYSV_IPC_MOD_H_ */
