Module Name: src
Committed By: pgoyette
Date: Fri Mar 9 09:37:01 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: sysv_mod.c
src/sys/modules/compat_sysv [pgoyette-compat]: Makefile
Log Message:
The last of the rename
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/sysv_mod.c
cvs rdiff -u -r1.3.10.2 -r1.3.10.3 src/sys/modules/compat_sysv/Makefile
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_mod.c
diff -u src/sys/compat/common/sysv_mod.c:1.1.2.5 src/sys/compat/common/sysv_mod.c:1.1.2.6
--- src/sys/compat/common/sysv_mod.c:1.1.2.5 Fri Mar 9 04:48:42 2018
+++ src/sys/compat/common/sysv_mod.c Fri Mar 9 09:37:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_mod.c,v 1.1.2.5 2018/03/09 04:48:42 pgoyette Exp $ */
+/* $NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 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.5 2018/03/09 04:48:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v 1.1.2.6 2018/03/09 09:37:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysv_mod.c,v
int sysctl_kern_sysvipc50(SYSCTLFN_PROTO);
#endif
-MODULE(MODULE_CLASS_EXEC, compat_sysv_ipc, "sysv_ipc");
+MODULE(MODULE_CLASS_EXEC, compat_sysv, "sysv_ipc");
/* Build the syscall package based on options specified */
@@ -95,9 +95,9 @@ static const struct syscall_package comp
};
static int
-compat_sysv_ipc_modcmd(modcmd_t cmd, void *arg)
+compat_sysv_modcmd(modcmd_t cmd, void *arg)
{
- static (*orig_sysvipc50_sysctl)(SYSCTLFN_PROTO);
+ static int (*orig_sysvipc50_sysctl)(SYSCTLFN_PROTO);
int error = 0;
Index: src/sys/modules/compat_sysv/Makefile
diff -u src/sys/modules/compat_sysv/Makefile:1.3.10.2 src/sys/modules/compat_sysv/Makefile:1.3.10.3
--- src/sys/modules/compat_sysv/Makefile:1.3.10.2 Fri Mar 9 03:58:33 2018
+++ src/sys/modules/compat_sysv/Makefile Fri Mar 9 09:37:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.10.2 2018/03/09 03:58:33 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3.10.3 2018/03/09 09:37:01 pgoyette Exp $
.include "../Makefile.inc"
@@ -15,7 +15,7 @@ CPPFLAGS+= -DCOMPAT_13
CPPFLAGS+= -DCOMPAT_14
CPPFLAGS+= -DCOMPAT_50
-SRCS+= sysv_ipc.c
+SRCS+= sysv_mod.c
SRCS+= kern_ipc_10.c
SRCS+= sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
SRCS+= sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c
