From bfb74f69d8d0b86d93b9042e1c148f91c16e4e8c Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Mon, 16 Nov 2009 13:32:40 +0000 Subject: [PATCH] Follow up commit to fix breakage that somehow passed by the compiler. --- sys/compat/linux32/common/linux32_ipc.h | 20 ++++++++++---------- sys/compat/linux32/common/linux32_ipccall.c | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/compat/linux32/common/linux32_ipc.h b/sys/compat/linux32/common/linux32_ipc.h index a577ee9cc3e..18108a4b2a6 100644 --- a/sys/compat/linux32/common/linux32_ipc.h +++ b/sys/compat/linux32/common/linux32_ipc.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_ipc.h,v 1.1 2008/05/20 17:31:56 njoly Exp $ */ +/* $NetBSD: linux32_ipc.h,v 1.2 2009/11/16 08:49:32 joerg Exp $ */ /* * Copyright (c) 2008 Nicolas Joly @@ -64,15 +64,15 @@ struct linux32_msqid_ds { 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 @@ struct linux_msqid64_ds { 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; diff --git a/sys/compat/linux32/common/linux32_ipccall.c b/sys/compat/linux32/common/linux32_ipccall.c index 0aa3bc2d340..c9dd1595045 100644 --- a/sys/compat/linux32/common/linux32_ipccall.c +++ b/sys/compat/linux32/common/linux32_ipccall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_ipccall.c,v 1.4 2009/04/27 13:24:18 njoly Exp $ */ +/* $NetBSD: linux32_ipccall.c,v 1.5 2009/11/16 08:49:32 joerg Exp $ */ /* * Copyright (c) 2008 Nicolas Joly @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_ipccall.c,v 1.4 2009/04/27 13:24:18 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_ipccall.c,v 1.5 2009/11/16 08:49:32 joerg Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -441,12 +441,12 @@ linux32_to_bsd_msqid_ds(struct linux32_msqid_ds *lmp, struct msqid_ds *bmp) 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 @@ bsd_to_linux32_msqid_ds(struct msqid_ds *bmp, struct linux32_msqid_ds *lmp) 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; -- 2.11.4.GIT