From: Michael Ellerman Date: Wed, 31 Mar 2021 00:38:45 +0000 (+1100) Subject: powerpc/mm/64s: Allow STRICT_KERNEL_RWX again X-Git-Tag: v5.13-rc1~90^2~141 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd573a81312fd9d6520b1cc81a88fd29e670e1ff;p=thirdparty%2Fkernel%2Flinux.git powerpc/mm/64s: Allow STRICT_KERNEL_RWX again We have now fixed the known bugs in STRICT_KERNEL_RWX for Book3S 64-bit Hash and Radix MMUs, see preceding commits, so allow the option to be selected again. Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210331003845.216246-6-mpe@ellerman.id.au --- diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 048e2b2a5c638..36d7c56df91d8 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -136,7 +136,7 @@ config PPC select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64 - select ARCH_HAS_STRICT_KERNEL_RWX if (PPC32 && !HIBERNATION) + select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION) select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UACCESS_FLUSHCACHE select ARCH_HAS_COPY_MC if PPC64