Module Name: src
Committed By: joerg
Date: Mon Nov 16 13:32:40 UTC 2009
Modified Files:
src/sys/compat/linux32/common: linux32_ipc.h linux32_ipccall.c
Log Message:
Follow up commit to fix breakage that somehow passed by the compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/linux32/common/linux32_ipc.h
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux32/common/linux32_ipccall.c
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/linux32/common/linux32_ipc.h
diff -u src/sys/compat/linux32/common/linux32_ipc.h:1.2 src/sys/compat/linux32/common/linux32_ipc.h:1.3
--- src/sys/compat/linux32/common/linux32_ipc.h:1.2 Mon Nov 16 08:49:32 2009
+++ src/sys/compat/linux32/common/linux32_ipc.h Mon Nov 16 13:32:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_ipc.h,v 1.2 2009/11/16 08:49:32 joerg Exp $ */
+/* $NetBSD: linux32_ipc.h,v 1.3 2009/11/16 13:32:40 joerg Exp $ */
/*
* Copyright (c) 2008 Nicolas Joly
@@ -64,15 +64,15 @@
linux_time_t l_msg_ctime;
netbsd32_pointer_t l_wwait; /* Linux internal */
netbsd32_pointer_t l_rwait; /* Linux internal */
- netbsd32_u_short l_msg_cbytes;
- netbsd32_u_short l_msg_qnum;
- netbsd32_u_short l_msg_qbytes;
- netbsd32_u_short l_msg_lspid;
- netbsd32_u_short l_msg_lrpid;
+ ushort l_msg_cbytes;
+ ushort l_msg_qnum;
+ ushort l_msg_qbytes;
+ ushort l_msg_lspid;
+ ushort l_msg_lrpid;
};
-struct linux_msqid64_ds {
- struct linux_ipc64_perm l_msg_perm;
+struct linux32_msqid64_ds {
+ struct linux32_ipc64_perm l_msg_perm;
linux32_time_t l_msg_stime;
netbsd32_u_long l___unused1;
linux32_time_t l_msg_rtime;
@@ -82,8 +82,8 @@
netbsd32_u_long l_msg_cbytes;
netbsd32_u_long l_msg_qnum;
netbsd32_u_long l_msg_qbytes;
- netbsd32_int l_msg_lspid;
- netbsd32_int l_msg_lrpid;
+ int l_msg_lspid;
+ int l_msg_lrpid;
netbsd32_u_long l___unused4;
netbsd32_u_long l___unused5;
Index: src/sys/compat/linux32/common/linux32_ipccall.c
diff -u src/sys/compat/linux32/common/linux32_ipccall.c:1.5 src/sys/compat/linux32/common/linux32_ipccall.c:1.6
--- src/sys/compat/linux32/common/linux32_ipccall.c:1.5 Mon Nov 16 08:49:32 2009
+++ src/sys/compat/linux32/common/linux32_ipccall.c Mon Nov 16 13:32:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_ipccall.c,v 1.5 2009/11/16 08:49:32 joerg Exp $ */
+/* $NetBSD: linux32_ipccall.c,v 1.6 2009/11/16 13:32:40 joerg Exp $ */
/*
* Copyright (c) 2008 Nicolas Joly
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_ipccall.c,v 1.5 2009/11/16 08:49:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_ipccall.c,v 1.6 2009/11/16 13:32:40 joerg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -441,12 +441,12 @@
bmp->msg_ctime = lmp->l_msg_ctime;
}
-void
+static void
linux32_to_bsd_msqid64_ds(struct linux32_msqid64_ds *lmp, struct msqid_ds *bmp)
{
memset(bmp, 0, sizeof(*bmp));
- linux_to_bsd_ipc64_perm(&lmp->l_msg_perm, &bmp->msg_perm);
+ linux32_to_bsd_ipc64_perm(&lmp->l_msg_perm, &bmp->msg_perm);
bmp->msg_stime = lmp->l_msg_stime;
bmp->msg_rtime = lmp->l_msg_rtime;
bmp->msg_ctime = lmp->l_msg_ctime;
@@ -475,14 +475,14 @@
lmp->l_msg_ctime = bmp->msg_ctime;
}
-void
+static void
bsd_to_linux32_msqid64_ds(struct msqid_ds *bmp, struct linux32_msqid64_ds *lmp)
{
memset(lmp, 0, sizeof(*lmp));
- bsd_to_linux_ipc64_perm(&bmp->msg_perm, &lmp->l_msg_perm);
- NETBSD32PTR32(lmp->l_msg_stime, bmp->msg_stime);
- NETBSD32PTR32(lmp->l_msg_rtime, bmp->msg_rtime);
+ bsd_to_linux32_ipc64_perm(&bmp->msg_perm, &lmp->l_msg_perm);
+ lmp->l_msg_stime = bmp->msg_stime;
+ lmp->l_msg_rtime = bmp->msg_rtime;
lmp->l_msg_ctime = bmp->msg_ctime;
lmp->l_msg_cbytes = bmp->_msg_cbytes;
lmp->l_msg_qnum = bmp->msg_qnum;
