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

Commit e49fe4c2 authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

powerpc: restore alphabetic order in Kconfig 



[ Upstream commit 4ec591e5 ]

This patch restores the alphabetic order which was broken by
commit 1e0fc9d1 ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX
for some configs")

Fixes: 1e0fc9d1 ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6321cca1

arch/powerpc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -141,12 +141,14 @@ config PPC 
	select ARCH_HAS_GCOV_PROFILE_ALL

	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_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_ZONE_DEVICE		if PPC_BOOK3S_64

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_OPTIONAL_KERNEL_RWX		if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT

	select ARCH_USE_BUILTIN_BSWAP
@@ -178,8 +180,6 @@ config PPC 
	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)

	select ARCH_OPTIONAL_KERNEL_RWX		if ARCH_HAS_STRICT_KERNEL_RWX

	select HAVE_CBPF_JIT			if !PPC64

	select HAVE_CONTEXT_TRACKING		if PPC64

	select HAVE_DEBUG_KMEMLEAK