From ff7363568f9d146bd270926027db00107328110d Mon Sep 17 00:00:00 2001 From: njoly Date: Mon, 28 Jan 2008 14:14:48 +0000 Subject: [PATCH] Update struct linux_shmid64_ds for 64bits archs. - shm_segsz should be of type size_t, not int. - Disable padding fields used on 32bits archs. --- sys/compat/linux/common/linux_shm.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/common/linux_shm.h b/sys/compat/linux/common/linux_shm.h index df88fd9b29bc..9e772e9a7c38 100644 --- a/sys/compat/linux/common/linux_shm.h +++ b/sys/compat/linux/common/linux_shm.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_shm.h,v 1.10 2007/12/20 23:02:56 dsl Exp $ */ +/* $NetBSD: linux_shm.h,v 1.11 2008/01/28 14:14:48 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -60,13 +60,19 @@ struct linux_shmid_ds { struct linux_shmid64_ds { struct linux_ipc64_perm l_shm_perm; - uint l_shm_segsz; + size_t l_shm_segsz; linux_time_t l_shm_atime; +#ifndef _LP64 u_long l____unused1; +#endif linux_time_t l_shm_dtime; +#ifndef _LP64 u_long l____unused2; +#endif linux_time_t l_shm_ctime; +#ifndef _LP64 u_long l____unused3; +#endif int l_shm_cpid; int l_shm_lpid; u_long l_shm_nattch;