From 5d85c8ac9eeee08495fd978c88820d9204d4d63e Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 4 Mar 2017 08:57:39 +0000 Subject: [PATCH] Remove attribute __packed from some IPC struct definition since Linuxulator is x86 only. The only notable differences in algnment for an LP64 64-bit system when compared to a 32-bit system is an eight or large byte types alignment. MFC after: 1 month --- sys/compat/linux/linux_ipc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 7a92c6ae0e11..90a20a25fd45 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -130,7 +130,6 @@ linux_to_bsd_ipc_perm(struct l_ipc_perm *lpp, struct ipc_perm *bpp) bpp->seq = lpp->seq; } - static void bsd_to_linux_ipc_perm(struct ipc_perm *bpp, struct l_ipc_perm *lpp) { @@ -158,11 +157,7 @@ struct l_msqid_ds { l_ushort msg_qbytes; /* max number of bytes on queue */ l_pid_t msg_lspid; /* pid of last msgsnd */ l_pid_t msg_lrpid; /* last receive pid */ -} -#if defined(__amd64__) && defined(COMPAT_LINUX32) -__packed -#endif -; +}; struct l_semid_ds { struct l_ipc_perm sem_perm; @@ -173,11 +168,7 @@ struct l_semid_ds { l_uintptr_t sem_pending_last; l_uintptr_t undo; l_ushort sem_nsems; -} -#if defined(__amd64__) && defined(COMPAT_LINUX32) -__packed -#endif -; +}; struct l_shmid_ds { struct l_ipc_perm shm_perm;