fixup for "mm: generalize ARCH_HAS_FILTER_PGPROT"

Semantic conflict with commit 6e2edd6 ("arm64: Ensure execute-only permissions are not allowed withoutEPAN") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
0day-ci · Mar 10, 2022 · 5f1d555 · 5f1d555
1 parent 52725a1
commit 5f1d555
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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