From nobody Wed Sep 07 15:10:21 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 4MN5KV1Rycz4bPRW; Wed, 7 Sep 2022 15:10: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 4MN5KV10CJz3YYG; Wed, 7 Sep 2022 15:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563422; 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=d2WIU44au8HsEUJx0pG2baeMadaO02ygdundHavGUbM=; b=mALFhlaT05kKOjBKypI/AUc4VinLVhzJuIrb6vzC6VwbEh6dC6pbUKJkMBQSDxAOkXOiMR D2mqLHQyCIRte7AIQP0QBaiLoZEaUUJtvz8yPSgHAjKQtJNoI0bDyCw6qDDaWI0x5TcN8n gs4/icPJ6a+l389fS2e/QyAjvRd9WQqejA8TSBNbhzKDZFFTOQPqhI5SJEP+z/kNh8PZpZ 63nb4OHH9IxX9JjuSAh8hfo3ghujLkDiE/sRj6a0T1rXWLq2Jqchr4K0H0m2g1PpVHTbE4 N8GZMvbsu1x6USh+m0Efy2ALo3KOBm1AdHPudWMebdjQCqCHgHJ/MjBW12LKPw== 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 4MN5KV04WYzZ49; Wed, 7 Sep 2022 15:10:22 +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 287FALuj025910; Wed, 7 Sep 2022 15:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FALJt025901; Wed, 7 Sep 2022 15:10:21 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:21 GMT Message-Id: <202209071510.287FALJt025901@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: adbc2b9385f3 - stable/13 - linuxkpi: io.h: Do not include asm/set_memory.h for armv6 and armv7 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: adbc2b9385f3c4191afb253eeb1902983bea4b9a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563422; 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=d2WIU44au8HsEUJx0pG2baeMadaO02ygdundHavGUbM=; b=ZElW6f9tpIIWCQQ5Rq4NSEjsz8klTBbCV6VpD360FHw690ILitAu9rhSafGh1hyQo0ukVG y69An3iT4VDEJTuVGQlMm7KTIokzYa3pG39tzNMknBo3Hg5wDGu8wcJPTiI/poXGa9eiGo ID8nEn21dvBm3Mds05CliHtb4yumJirKVczpt+AOTcptY9yo31zIQGYafq1SMJEfQHacdn 2GPyos42wISRv3GStAuB5p6pVwU/PQX1+zINDJE8e9KlSD+aM7VlFqBchZs/T12YvJm25u 2Djdvz3XpW1dCKxmbHgyT5UukaX5zSrtiZb2j9KAAraTfUToohpl1RT+8K1U2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563422; a=rsa-sha256; cv=none; b=qG6dnVgtZPFGEcieGq1Q3i1usuOczc2gxncAua+rY0bEtCmCdC/whtsRUGAZQ1vem6NJc3 tK+iZUUeLqqE0nOlZ3G0f06lyheX7WYP3JNC9FGnlb+hNWr7BiN5fuyoR/44UYN0AIwsJH ak7sHPN47XBq00j5fqkg02uBD/+6aNRsntGwepkbrB2F/zu88X9izSVBZGO+j3T5MB3AP2 elGg/mywXui4F8LstvBiaNpgma+dAvFMAe6qHqUJobhgCu88pdcMow0aHUIAj9k8dmosFF zCwqBFvo0dakV9uKV/OpcZn4DuXp2luEN4+04cAe+Li92WaP+Qxhqppo0gySwQ== 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=adbc2b9385f3c4191afb253eeb1902983bea4b9a commit adbc2b9385f3c4191afb253eeb1902983bea4b9a Author: Emmanuel Vadot AuthorDate: 2022-08-08 16:54:23 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:04 +0000 linuxkpi: io.h: Do not include asm/set_memory.h for armv6 and armv7 They do not have the same pmap api and this cannot work for those arch. Fixes: 789dbdbb48574 ("linuxkpi: Add arch_io_{reserve,free}_memtype_wc") Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit d387a1b4b199630d76b127fded8edbcfecf5a123) --- 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 5c3e4bec5484..2705ea3a3ba9 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -38,7 +38,9 @@ #include #include +#if defined(__amd64__) || defined(__arm64__) || defined(__i386__) || defined(__riscv__) #include +#endif /* * XXX This is all x86 specific. It should be bus space access.