Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d215432 authored by Russell Currey's avatar Russell Currey Committed by Greg Kroah-Hartman
Browse files

powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE 



[ Upstream commit c55d7b5e64265fdca45c85b639013e770bde2d0e ]

I have tested this with the Radix MMU and everything seems to work, and
the previous patch for Hash seems to fix everything too.
STRICT_KERNEL_RWX should still be disabled by default for now.

Please test STRICT_KERNEL_RWX + RELOCATABLE!

Signed-off-by: default avatarRussell Currey <ruscur@russell.cc>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191224064126.183670-2-ruscur@russell.cc


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6da57562

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ config PPC 
	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !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	if PPC64

	select ARCH_HAS_UBSAN_SANITIZE_ALL