From nobody Wed Oct 4 18:21:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S131D23JQz4vm60; Wed, 4 Oct 2023 18:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S131D1QRhz3VFY; Wed, 4 Oct 2023 18:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696443696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7QxVIxQ1EFZ483T7JbeXRTWUYQp3AW5CVZxRfNwvvgU=; b=LJ08NgFjyHAnS6MQ0th0GbT26EKmzNClKmnT1SNZoLHi6kIq889ZTa3TybPpiQd3oNYMpv FTqVGk4crW3U9VxWO7r48lpxAZClNVT466nLUoI9EDW4e4J3I2oo5pyRm5PFE7zFBJc9qf S4C0aamC73MxoJTuu1O1numdzceP4k/oeAhnlRuXHRs5AqydD/IdU228TymZy81Ryw5Mbl l7rtIgXQnVD9BvYkDIYxdTORnVeZuqrTGTmWIO9Cz6wTvm/qb3dgXU0YpuAM39O7tKd8TG 0dFEdxhHwMIfk4PS8Wn2+pTt3kgNAp8z7QPFhVNDZWsPziXAV+4pSXgacc9s9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696443696; a=rsa-sha256; cv=none; b=ESkc7EGRItPc2BLtmrAODKicpuYfjJAJysXgunV9qXZtFhr/15lxBb3hdPJdMUCha8j48S JXT0WVUdjUUVdMMMseaeMtcviZguyomGPkp+yx+97j7etrr14mGNCBjo6aZWOdaM0Oi9ir AZZ1XsRQMfQ9Nv76GAEH6UmuCzKvSdd7GeN9VS8hPswUhs6eh9YJnK9TPncVyKJfshwzgH CmhR7FPh4GxaofMLnI4FJOPvXcG5O0/j4P4X47L20W7l0TWkfeBksq9z0nKZI4I70Qb2hs OEwA6ZAbCayAfWHf7AjysqVp3/JrsDI7QOqc/CBuTSkitru6YCYlBFEDHX55ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696443696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7QxVIxQ1EFZ483T7JbeXRTWUYQp3AW5CVZxRfNwvvgU=; b=mgghZgffsYuUhLoDNzbWGOO9LVpDmEcczvjoXiN1ZPNrFsMpUZadocuwdQi5EKrHvMpwSR sNNkIf7zkbjQud1dilx8vx6VQwrVacqMnOL/VpTrPHFSUquRQ8lW3qUm4QlmWasvykyUY+ OY7ymMadvZKa8NeKnMEFPrIBUXL0J97VgS/L/q/DjGVyA/PcmlkCtRiIugI4Q6/JUlsz1b Dq6n0pef/w9KScRS0m9Omr2Hn4xbOkBGBwXFrm4YbhoHBTTE/lebRb+PFC9Thr19EWNXI0 RbfV9dIroTcHsh+LGFgClE35g/y5B/2I/wnWLhn7Zt1y5/offPO0XCFz6qOetA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S131D0MrKzncB; Wed, 4 Oct 2023 18:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394ILZcL085880; Wed, 4 Oct 2023 18:21:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394ILZJA085877; Wed, 4 Oct 2023 18:21:35 GMT (envelope-from git) Date: Wed, 4 Oct 2023 18:21:35 GMT Message-Id: <202310041821.394ILZJA085877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 1ee29160c5e5 - main - linux(4): Fix semid64_ds structure layout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ee29160c5e5d8fa70173445b4a6de6742af74dc Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee29160c5e5d8fa70173445b4a6de6742af74dc commit 1ee29160c5e5d8fa70173445b4a6de6742af74dc Author: Dmitry Chagin AuthorDate: 2023-10-04 18:21:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-04 18:21:12 +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 --- 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;