powerpc/32s: Activate KUAP and KUEP by default

Now that KUAP and KUEP have been significantly optimised and can be
disabled at boot time using 'nosmap' and 'nosmep' kernel parameters,
them can be active by default like in other powerpc platforms.

It is still possible to disable them completely in the configuration.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/86c7c74a3ba5312daea7e9658b096e2bcc6f4b64.1622708530.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index d4acba7551c281824f40d7a31aa9e66d10227a46..50237e2007e78d3c0b680f30286a418f0e76558b 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -390,7 +390,7 @@ config PPC_HAVE_KUEP
 config PPC_KUEP
        bool "Kernel Userspace Execution Prevention"
        depends on PPC_HAVE_KUEP
-       default y if !PPC_BOOK3S_32
+       default y
        help
          Enable support for Kernel Userspace Execution Prevention (KUEP)
 
@@ -402,7 +402,7 @@ config PPC_HAVE_KUAP
 config PPC_KUAP
        bool "Kernel Userspace Access Protection"
        depends on PPC_HAVE_KUAP
-       default y if !PPC_BOOK3S_32
+       default y
        help
          Enable support for Kernel Userspace Access Protection (KUAP)