From nobody Wed Sep 7 15:10:23 2022 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 4MN5KW2p2Gz4bPTx; Wed, 7 Sep 2022 15:10:23 +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 4MN5KW21r2z3Yy4; Wed, 7 Sep 2022 15:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563423; 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=TJPkcoCd9kc6nICu068IIUXGX6N3dPq1+Ufwke8i/zI=; b=exSA1FSswNnCvS+pFiOpu4unbfZ+C/5JSRjVeBGhiHrrrujaOLikU8OlEEtKoGORHyXum4 8BUu7Gtb+jXF+C2ItMQ8fjFJRYh2Zr2ujGxa/ICyMQwIAUUVPYU13dpzJadiX7cYei2txf CM6suwl6MIQBIylBbPn118ZdbKE8MJSLMs1Adk4H4ZP5CcaiUamR/vnGgVa5BVaQ3abMFx Tzj9Yj6IAHmInYrwn6VR4xAGa7RLNMidLWKanbOyCICogSNMDR4ABwjQ7df3Hm7sqnVeH6 +FyQX8gbAZVR8F96+mzUJ+8cMGfBdq8ayCEOruzPk8GHqRw8N3BCsNcRsK34Ig== 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 4MN5KW15fkzZ2S; Wed, 7 Sep 2022 15:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 287FAN06026184; Wed, 7 Sep 2022 15:10:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FANeY026183; Wed, 7 Sep 2022 15:10:23 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:23 GMT Message-Id: <202209071510.287FANeY026183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: e7a86da0dbd2 - stable/13 - linuxkpi: io.h: Only exclude armv6 and armv7 for asm/set_memory.h 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7a86da0dbd2a6fe3c49fe6145c7c0d5baac83df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563423; 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=TJPkcoCd9kc6nICu068IIUXGX6N3dPq1+Ufwke8i/zI=; b=xmY8phOPQXyeilVmK1toD+Kgn8LjhAN3f47uajOSIHGSmjz8v6m2XIum68fM7D2BUu/PyB XS4C8WCeKL4dFxDFNj0JiSbtT5nfIrPvMAsFT2bzcY5VIJPe20YN7XfPIF6QDwsYdL7MhT rFjkr5K8RhhqJ+bQqI9ZprphrmN+qhnjFdBmnTXPGaMcxD0v0T45h7LUdquTOgsy1cKrqF sdhQtcNzmoWAScBYjfDFbvE/yqwVO3mbG4CyZCORLi8inc7aDAyyho7dlri1VdH0AEzrkS 9bx+l0cJJChdZGN7c6ILXdTkFucEiFupWXgxCbZKxPDqi9CXW9M6BEZpihd+3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563423; a=rsa-sha256; cv=none; b=rxY3YO86+9BnurQyVOmqpIXAHtr/1CkDWHho43sJpuDvZIixsXRV+hjNK0YQoAsETQiIOW RMgKGEfpq861sw4QpCE+IjOMNLctlXHVizwvBNlQxDlXps+JD/FnQY57hIYsx+ZgX36jJ9 74Zi1QKgUAevGcNIqS5MmLyXfVRrJm1NA6sCqkkbe5dmJ3/XTMBBmmm8P8FtbtuVpB00NY VspAc2WgHld5wDqlkqG3pOa0fW9jbA4KHwMzlEIvwzkIY0LCNf5bBUF1g6RVkW5Q4xcA6u 2wH080+VGtFOJyNcTVMGrS70wuYJajt324jjeZ8NaaZsAhpEre7oAaDUfBUBBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a86da0dbd2a6fe3c49fe6145c7c0d5baac83df commit e7a86da0dbd2a6fe3c49fe6145c7c0d5baac83df Author: Emmanuel Vadot AuthorDate: 2022-08-08 18:21:08 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:04 +0000 linuxkpi: io.h: Only exclude armv6 and armv7 for asm/set_memory.h Other arches like powerpc* needs it. Fixes: d387a1b4b1996 ("linuxkpi: io.h: Do not include asm/set_memory.h for armv6 and armv7") Fixes: 789dbdbb48574 ("linuxkpi: Add arch_io_{reserve,free}_memtype_wc") Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 521abc32e22a74981360aa5883bb383aea9ee243) --- sys/compat/linuxkpi/common/include/linux/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 2705ea3a3ba9..6ee4753a2df5 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -38,7 +38,7 @@ #include #include -#if defined(__amd64__) || defined(__arm64__) || defined(__i386__) || defined(__riscv__) +#if !defined(__arm__) #include #endif