Date: Wed, 7 Sep 2022 15:10:21 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: adbc2b9385f3 - stable/13 - linuxkpi: io.h: Do not include asm/set_memory.h for armv6 and armv7 Message-ID: <202209071510.287FALJt025901@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=adbc2b9385f3c4191afb253eeb1902983bea4b9a commit adbc2b9385f3c4191afb253eeb1902983bea4b9a Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2022-08-08 16:54:23 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> 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 <linux/compiler.h> #include <linux/types.h> +#if defined(__amd64__) || defined(__arm64__) || defined(__i386__) || defined(__riscv__) #include <asm/set_memory.h> +#endif /* * XXX This is all x86 specific. It should be bus space access.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209071510.287FALJt025901>