The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=521abc32e22a74981360aa5883bb383aea9ee243
commit 521abc32e22a74981360aa5883bb383aea9ee243 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2022-08-08 18:21:08 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2022-08-08 18:22:44 +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 --- 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 dba4a8719c77..e12f9b36a9a1 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -38,7 +38,7 @@ #include <linux/compiler.h> #include <linux/types.h> -#if defined(__amd64__) || defined(__arm64__) || defined(__i386__) || defined(__riscv__) +#if !defined(__arm__) #include <asm/set_memory.h> #endif
