From nobody Sun Dec 24 13:20:03 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 4SyhTv30ssz54c9R; Sun, 24 Dec 2023 13:20:03 +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 4SyhTv2Sd8z3cMl; Sun, 24 Dec 2023 13:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703424003; 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=/B9deU0ke51aAbrBkDgyXRFPje43UTwrdYrcJ+5JyFQ=; b=NAR6JmJebMn/LxqqsEur12zLkx0XW2UE7Wu+JB+txNGhgGuCF+krtQFo6D0m20jpl2b7oW YypnhDqe6SdoUmPnYqBFthxaU8MDKYrWnLfVHHh1DOdN4WZUk3LmaAMPVHA4I+gfhA3aKh qdrO3KSz/Rid0aZ6VmSb7lT3p3+8H8GSEH1xqeBN3SUhHXOp62A1nSW3By/GwULK76SUZ2 5kzM8YLdrOdCY2DInVMvPzfT/5brIW1F//44BvUcwAjYpXd9JpuWli3OLxvDeUagc5M8rc b6y3mn4jayS9tFm7tJLw+8BXVLta/DqhXAx0eX5fHNfKEf017MZtTe04A46Kbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703424003; a=rsa-sha256; cv=none; b=TdkCoWkopL4puHru1Lz827+50O666fUZbqEmmKO8OXFEBEIwVu2GsO+aPx3UcAxilx5Oid p3+wdCVCYvvjG3se3XAJbM0RMWL7JFNVWjZlIIHOQkMB+S1RP2gQb2wejQERTMTX1poAT9 P+t/7mRWTBteyxGMq0YAw5Vs/I4h5rdMhE81dStkNGWj9wOx7Wgevpa7UA7CAUw6uMflk2 Fiw84YkVgJjpGxKmlgaWvV3HbkQmPchHWpB9aHe2vxHf+B1jNvsAkuEkAaGKEt1lujVOaz wQRMflUlSQJUZInOiZgqoqoS2xDIrRrdw9tHT6mdYbCdQz6hbZlbDzDGBsbO0A== 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=1703424003; 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=/B9deU0ke51aAbrBkDgyXRFPje43UTwrdYrcJ+5JyFQ=; b=b4swIrAVpo4XB1935c8tzmGE2EGKUlNZmIElwqlo3meue1VVVYMoVd2qSN1epEpWXg7Avu 0W9DbCrVBF/4rhJEO2bp6COCNCRDT78HizRNvaqDXvnFhLWKIjIT125O6ju5xoxaEIZ8ZH wbuItpWiCEqK6NSGtQv/ID5iN0keVZI1OZsEQCgtWYQ5izwFqbH2h0cdvFvsG/UgogtxPN bfjZ+K0LIzxGiH6xW01bW80rnPosVu0VWGMoePDK04cwFGdf96HeM9r/M6Q5r9ErpOuPRr RdA/O/E26qvuPeXBMy5PrK0sfDn65ZNNVyWezRVnGCYvbjK/tCkPpvJT9oWHug== 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 4SyhTv1YGDzV0h; Sun, 24 Dec 2023 13:20:03 +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 3BODK3c0076366; Sun, 24 Dec 2023 13:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BODK37O076361; Sun, 24 Dec 2023 13:20:03 GMT (envelope-from git) Date: Sun, 24 Dec 2023 13:20:03 GMT Message-Id: <202312241320.3BODK37O076361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 73ccd188c43a - main - LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs. 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73ccd188c43a6cd52a12ac33411896220b2d2e54 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=73ccd188c43a6cd52a12ac33411896220b2d2e54 commit 73ccd188c43a6cd52a12ac33411896220b2d2e54 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 12:48:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-12-24 12:48:06 +0000 LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs. 32 bit archs includes nonatomic version from linux/io-64-nonatomic-*.h Sponsored by: Serenity Cyber Security, LLC Fixes: dcfc983373c3 ("LinuxKPI: Implement ioread64()") MFC after: 1 week --- sys/compat/linuxkpi/common/include/linux/io.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index d70cda77400e..bce70ed0cb8d 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -350,6 +350,7 @@ ioread32be(const volatile void *addr) } #define ioread32be(addr) ioread32be(addr) +#ifdef __LP64__ #undef ioread64 static inline uint64_t ioread64(const volatile void *addr) @@ -357,6 +358,7 @@ ioread64(const volatile void *addr) return (readq(addr)); } #define ioread64(addr) ioread64(addr) +#endif #undef iowrite8 static inline void