From nobody Sat Feb 17 21:33:18 2024 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 4Tchqg2Jljz59lFS; Sat, 17 Feb 2024 21:33:19 +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 4Tchqf74Fxz4hvd; Sat, 17 Feb 2024 21:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205599; 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=zD+sDFXKCyNo8pUPpDfullVRcOV/PUY1s7t6AZ+X/XE=; b=BDC9cXU2P+XyUkXfjVIS3ywm7wEayyHQioP7TKRIQGRhfEBlUfYseLEkmvJrLfsIdMeMaR XPDS2Nj0lxgl41NF7cgoGogSfRt9DHlMw032OB9GpU51Mk4YHAqBJdVHrzm4sllNlfall0 rgplMjy9hxnW3uwNwHvyeDLPSp/hPT5AuimDoE0s7jbmcf0XV7wxdstFtrgOAz664OdmJ/ qVqlaytE+EXI68Pn99AiTAZonn/6XH6aUwrKRE23ZCGIE4TsZZaPYagkIhCDNS8iGhOm9/ xWh+1Cm101tjmipzB+SKxZGCeyv4n3Xtlyo/SmT5R0Wu4bai4jYcEAsy3jjpLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205599; 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=zD+sDFXKCyNo8pUPpDfullVRcOV/PUY1s7t6AZ+X/XE=; b=UIGqMLvKxIPSq8t9hrIl0kajBQP8sKBUaIPTcllwAQrOhi9LytbEwLW5EzoTrjSXQwZCQ0 YMcLbuYl7iAPkm1GieXcv1iqwB0Nc2AjTMXjqp/AzlZUWdWD68MKO48U+SrQWcsiqLMRF4 W9v73RGol8+5KmrA+mTp04TKnVq0IPj+JngXHeYIsPRQpIzYQjt+QB+6SgFQwZyBC5NHRX 6ZCNz57FC/9IQ7qakSj3zKmtQ9iGJXqRmOOq0+Z1p8Sa1rb+1dvGJQYa2Z+LUFDNoxqcA1 BEV4xHrzRRFjUuNWJ9YtbjQc1/zkB7yntfLCMdRTLPzUX4zAo2LdR1ehSeVuHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205599; a=rsa-sha256; cv=none; b=gbsVw7RfCpDVIgtMNuJ981JUheJgui2in1F/11jf30VI1Er2rmQBGX6zXrh7Rt2LNocjaV NBWDwppxLZy3BmJGwDFpaO7G66hMZP5XU3RO0AE4IsAcklDQjSAywg04F67pk6Gayw34Il GH/zYDaANmxUDNqtERVSM7k/vZxgTK3IdF8fVY5/KBvkyfSb9yx1ZirlTc9VCr+N+gHprG A6OPPsHU5vfmprbif5jnp6LBieLLupFj8PB9nFTUl9jbh99d6AmPRnejM21IMDF8VzUcAS NnhQl/zfBWjGwybhTWcXFB2//QwewQ/QbXX/mhKESQAi7HpKiMfNk1IKRNFuKw== 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 4Tchqf673SzPZZ; Sat, 17 Feb 2024 21:33:18 +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 41HLXIw6021542; Sat, 17 Feb 2024 21:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLXIKt021539; Sat, 17 Feb 2024 21:33:18 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:33:18 GMT Message-Id: <202402172133.41HLXIKt021539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 8aa9315b537d - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8aa9315b537d505977d77d7c78fafe5a495a6601 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=8aa9315b537d505977d77d7c78fafe5a495a6601 commit 8aa9315b537d505977d77d7c78fafe5a495a6601 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 12:48:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:39 +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 (cherry picked from commit 73ccd188c43a6cd52a12ac33411896220b2d2e54) --- 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