git: 4c1b13627a75 - stable/14 - linux(4): Fix semid64_ds structure layout

From: Dmitry Chagin <dchagin_at_FreeBSD.org>
Date: Tue, 10 Oct 2023 05:14:22 UTC
The branch stable/14 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=4c1b13627a75bee92652cded438ce313fefeec67

commit 4c1b13627a75bee92652cded438ce313fefeec67
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-10-04 18:21:12 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-10-10 05:12:13 +0000

    linux(4): Fix semid64_ds structure layout
    
    Unlike x86_64, other 64-bit architectures do not have paddings
    for the time fields.
    
    MFC after:              1 week
    
    (cherry picked from commit 1ee29160c5e5d8fa70173445b4a6de6742af74dc)
---
 sys/compat/linux/linux_ipc64.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys/compat/linux/linux_ipc64.h b/sys/compat/linux/linux_ipc64.h
index 75563c55971c..e3834b909bfc 100644
--- a/sys/compat/linux/linux_ipc64.h
+++ b/sys/compat/linux/linux_ipc64.h
@@ -101,9 +101,13 @@ struct l_msqid64_ds {
 struct l_semid64_ds {
 	struct l_ipc64_perm sem_perm;	/* permissions */
 	l_time_t	sem_otime;	/* last semop time */
+#if defined(__amd64__) || defined(__i386__)
 	l_ulong		__unused1;
+#endif
 	l_time_t	sem_ctime;	/* last change time */
+#if defined(__amd64__) || defined(__i386__)
 	l_ulong		__unused2;
+#endif
 	l_ulong		sem_nsems;	/* no. of semaphores in array */
 	l_ulong		__unused3;
 	l_ulong		__unused4;