From nobody Mon Aug 08 16:56:07 2022 X-Original-To: dev-commits-src-main@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 4M1j5M5kNgz4YWH7; Mon, 8 Aug 2022 16:56:07 +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 4M1j5M5GGFz3Nwn; Mon, 8 Aug 2022 16:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659977767; 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=jUAEz7umcac/MofpUH5OpT9e1RJRMzoe39u9Y2gJ6b0=; b=ApSQfsSM5aC4bwvv/konGRXyVad6O4ckdG93tFDv4Kowj252pGKLUdQgjn+jAY6dqqgeUj PE43NhR2ZdYVnUJLCiJymW6GmgbQK3eGevELugqKQvZFFDpfMF51Q2OryAdwpYYBRBZBJJ KMvdnwBqChPB3kgNzoaG3a6LP/dBLJjCZ8Y2+c5jW4NVirrmFQFo4p9vnypyAwo7eVCVBO Cj8++HwEliS6WxKVbc67QIUeReN2LRijxK2wHsUMLqVgRF6XhRulYxAt8LkkVej1CEENxX 8YLObpGLpEjlev7zD3sHxLQOdWxYVbax/m/h4falrlFu1wuzXWRGQLv+XLIefg== 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 4M1j5M4M03z10K9; Mon, 8 Aug 2022 16:56:07 +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 278Gu7UH019567; Mon, 8 Aug 2022 16:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278Gu7DO019566; Mon, 8 Aug 2022 16:56:07 GMT (envelope-from git) Date: Mon, 8 Aug 2022 16:56:07 GMT Message-Id: <202208081656.278Gu7DO019566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d387a1b4b199 - main - linuxkpi: io.h: Do not include asm/set_memory.h for armv6 and armv7 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d387a1b4b199630d76b127fded8edbcfecf5a123 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659977767; 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=jUAEz7umcac/MofpUH5OpT9e1RJRMzoe39u9Y2gJ6b0=; b=OL7GNQA3H4B+2TEYT7Z5PDvlSEL0hwlsVkC+N5MCKDfxD1FqozMLtDmJ3pCecYbLc70ulh 1+5d5+U+GwNOHNKcB+Sy7D7IFROT9Fk5HNgh7yO0F1fhEQCb6EqcUxeyY96cL7TuyNFCSR Kd6gjcaEEGxgKRlRwfNwd9Eet4oHkuM3fy6eJ+K3dhtKLLKTM1XmEVX0eFi/8Zvo4TgwFl j/SOsEgAU32fggWNAHsaiAQNvprgHtfQqx7/CZrNcVfkT/JvKE+W1avDkVJ+Je0ZdklPP/ 2xrlgFwVLhk0YvN0umRJhSi14Snu8nzEcMTbeljq/56ZgWqduosAhKPTQcpcNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659977767; a=rsa-sha256; cv=none; b=HTb5Wtjc/t2tALyNG6bO4HMQiOgxc+eTuBoay+0H1MmyXgu5O3vHC0/I/syM2qv0FfXSEj eCudql/f9+BSgZn8SSpH3CAtj8BBaUbGru3isDrcw/qNj5epSfSoc1cRLKKuBzY7G1/CqW SQ/yx9VIftwx6kJlyAsnbXJx43V14WvmfI3+5CzHBGmKYCl6C1uuAxqTX/RGoPxi1uyhZH aKJ52PupUSlJz2aPrPUYskiTnGJB6XtWWCuCBE4YGkRrhS11JBJidDuRHVQZ4bWjCMW2zo ZQsma4yqPtC7kdZv8sWsxIEN1B1Vx5DB+cgN+V8jy9U6UXJCKA/aWfhmnTowpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d387a1b4b199630d76b127fded8edbcfecf5a123 commit d387a1b4b199630d76b127fded8edbcfecf5a123 Author: Emmanuel Vadot AuthorDate: 2022-08-08 16:54:23 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-08 16:55:58 +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 --- 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 32183707c255..dba4a8719c77 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.