From nobody Tue Oct 10 05:14:22 2023 X-Original-To: dev-commits-src-all@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 4S4PG66DFbz4x7cv; Tue, 10 Oct 2023 05:14:22 +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 4S4PG64FTJz4f4k; Tue, 10 Oct 2023 05:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696914862; 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=WXuOLCy0lgpW8eCCuIp79B20FwSGGkSiyDqRCl+rFj8=; b=yMYcjCP8KI/20dmBwDcd3Z/l5smeFYXgFnB9zhcLWJDHI/u9VK6b0oN/sdLqqF9hZOyml+ nn6ZblB/ZeW2r6j/YQ1sjzr84+5kCPOwcrnf7aNCQMA1s/xhtm+4oyOEDMaKytWvEMuuSO JG1lbnnSlBt8P2rs0TPP1JwjlwTvZQ5TNVCgqn+GVWNIfd7N7qlTzFF+wx2EENXIetessl wN9m5ddq0I3qMYJrttXxpPpvW3BSA6aJObAgKgohggnVFDzMZ2HG3eCckU2iCLmOeDIV1G Nt23TkXhq/xgfII8fi/HfUHxRurrbg6hqkvMN2n0d/jqhRqAQzyiWVBKF0jNNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696914862; a=rsa-sha256; cv=none; b=lHNguO4P10y4CTWqByTsfbepQludlT+Oq6fma5KPRyg6HvJ5v4602Sg5Vq2C+ZH/EUAD4n 4KjLACzoVHNqgYADvPYfxu5dk5vAE0MVchdGPo26wh6oyXOfVc+Qc3PAGPqyvrIpC8b+sZ qjADaMPqBwP3znPrRLn/OX4ngox1L5q3enOjzjwaX75RBOcCsCUi/ZYmjIbOxyt08H/URM c++8nMLpKGBLGggzE1/CuE432GbANGKzXEkt70tXBEtmw4Jbq86N7325yDsDPrAc27pV+m PMS8N2s8cFPE8TnOY9sfpo0kXRcYcJR2VGyRqfsm8n8VhQFh8/jg5a/jgyohrw== 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=1696914862; 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=WXuOLCy0lgpW8eCCuIp79B20FwSGGkSiyDqRCl+rFj8=; b=Bb1N1g1DDTSyUoeMgbTTtmBhswYS1wYnqOCHQh5PI/7KzpTeP8BwLhYVvtpY4NBELGTNYi PbvEHSDTnSSr/AfWE/HJoQjZ7+TPJ6cL4l73VKZ5O2bxUQRCQCL+YWKU+FunW8q/6CEVNN 0zWLjkrKWIT2WBmmgo6EHb/PlV3b7cl5l+OnJVJtVzz8buMhUY4yIC6+kWAX1yeZ0PtN+e Spa8pnb7o7Ui+XHR9MSkbWGBBRJxg6Y2CtAL2WpAmrirt67nflePserEukOWhUx54dZoh4 o4wB8pqVPu9pSmtSda4/IsI+DqT3MMVQw9tLaUdcX7+WWXnf1AYtn47yAHYMsQ== 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 4S4PG63FzgzBMB; Tue, 10 Oct 2023 05:14:22 +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 39A5EM6E071986; Tue, 10 Oct 2023 05:14:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39A5EMfG071983; Tue, 10 Oct 2023 05:14:22 GMT (envelope-from git) Date: Tue, 10 Oct 2023 05:14:22 GMT Message-Id: <202310100514.39A5EMfG071983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4c1b13627a75 - stable/14 - linux(4): Fix semid64_ds structure layout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c1b13627a75bee92652cded438ce313fefeec67 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1b13627a75bee92652cded438ce313fefeec67 commit 4c1b13627a75bee92652cded438ce313fefeec67 Author: Dmitry Chagin AuthorDate: 2023-10-04 18:21:12 +0000 Commit: Dmitry Chagin 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;