summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2017-04-15 15:08:23 +0000
committerdchagin <dchagin@FreeBSD.org>2017-04-15 15:08:23 +0000
commitfcb83a9e01b7d523ce26181a02c5967fbdaa5f90 (patch)
treecb46b4445df0d70e2886365c06ae1ff490faa98e
parent9878fb1e0f314058f4c30cc4c77722f00e17188a (diff)
downloadFreeBSD-src-fcb83a9e01b7d523ce26181a02c5967fbdaa5f90.zip
FreeBSD-src-fcb83a9e01b7d523ce26181a02c5967fbdaa5f90.tar.gz
MFC r314647:
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.
-rw-r--r--sys/compat/linux/linux_ipc.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 7a92c6a..90a20a2 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;
OpenPOWER on IntegriCloud