Hi all,
After merging the akpm-current tree, today's linux-next build (arm64
defconfig) failed like this:
mm/mmap.c: In function 'vm_get_page_prot':
mm/mmap.c:122:16: error: implicit declaration of function 'arch_filter_pgprot' [-Werror=implicit-function-declaration]
122 | return arch_filter_pgprot(ret);
| ^~~~~~~~~~~~~~~~~~
mm/mmap.c:122:16: error: incompatible types when returning type 'int' but 'pgprot_t' was expected
122 | return arch_filter_pgprot(ret);
| ^~~~~~~~~~~~~~~~~~~~~~~
mm/mmap.c:123:1: error: control reaches end of non-void function [-Werror=return-type]
123 | }
| ^
Caused by commit
e25ff72a53b9 ("mm: generalize ARCH_HAS_FILTER_PGPROT")
interacting with commit
6e2edd6371a4 ("arm64: Ensure execute-only permissions are not allowed without EPAN")
from Linus' tree (today).
I have applied the following merg fix patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 10 Mar 2022 19:50:30 +1100
Subject: [PATCH] fixup for "mm: generalize ARCH_HAS_FILTER_PGPROT"
Semantic conflict with commit
6e2edd6371a4 ("arm64: Ensure execute-only permissions are not allowed without EPAN")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/arm64/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0b8f9328cd95..962c84952c98 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -25,7 +25,6 @@ config ARM64
select ARCH_HAS_DMA_PREP_COHERENT
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
select ARCH_HAS_FAST_MULTIPLIER
- select ARCH_HAS_FILTER_PGPROT
select ARCH_HAS_FORTIFY_SOURCE
select ARCH_HAS_GCOV_PROFILE_ALL
select ARCH_HAS_GIGANTIC_PAGE
--
2.34.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpgkKI4jUjwH.pgp
Description: OpenPGP digital signature
