powerpc/8xx: Do not allow Pinned TLBs with STRICT_KERNEL_RWX or DEBUG_PAGEALLOC

Pinning TLBs bypasses STRICT_KERNEL_RWX or DEBUG_PAGEALLOC protections
so it should only be allowed when those are not selected

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a4c575c95937faf8e4f8f2b4ec4ef5af3dc27266..a2b669729440733a6bec0e340c315f25f13cb9a7 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1176,7 +1176,8 @@ config CONSISTENT_SIZE
 
 config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
-       depends on ADVANCED_OPTIONS && PPC_8xx
+       depends on ADVANCED_OPTIONS && PPC_8xx && \
+                  !DEBUG_PAGEALLOC && !STRICT_KERNEL_RWX
 
 config PIN_TLB_DATA
        bool "Pinned TLB for DATA"