generic: 5.15, 6.1: enable CNP support

Ever since CONFIG_ARM64_PAN was enabled Common Not Private (CNP) is now
visible and kernel builds will stop as they are not set in kernel config
for 5.15 and 6.1.

So, lets enable Common Not Private (CNP) which is ARMv8.2 feature and will
be NOP of CPU-s that dont support it.

Fixes: a2662309aae1 ("kernel: Enable CONFIG_ARM64_PAN to restrict kernel access to user space memory")
Link: https://github.com/openwrt/openwrt/pull/16211
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 1b8ad1cf42c593fa830ae566f23c2d22de7dd453..9711b8372f615252b9986366dce0c43af5b4dbab 100644 (file)
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -318,8 +318,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_64K_PAGES is not set
 # CONFIG_ARM64_AMU_EXTN is not set
 # CONFIG_ARM64_BTI is not set
+CONFIG_ARM64_CNP=y
 # CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_E0PD is not set
+# CONFIG_ARM64_EPAN is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
 # CONFIG_ARM64_ERRATUM_1286807 is not set

diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
index 81c66f41df9b8d267acdd8abff6426dc7c25646d..ef4ab7bac19c9f118df61a506c7b54094d5d4ec2 100644 (file)
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@@ -348,8 +348,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_64K_PAGES is not set
 # CONFIG_ARM64_AMU_EXTN is not set
 # CONFIG_ARM64_BTI is not set
+CONFIG_ARM64_CNP=y
 # CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_E0PD is not set
+# CONFIG_ARM64_EPAN is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
 # CONFIG_ARM64_ERRATUM_1286807 is not set