summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2018-01-04 10:35:25 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2018-01-20 23:06:24 -0500
commit4ec591e51a4b0aedb6c7f1a8cd722aa58d7f61ba (patch)
tree9cd107586f6369dd35a504ab30c0fe30ed4085d6
parentcef37ac119b1abffcb41a9a706792968676ea106 (diff)
powerpc: restore alphabetic order in Kconfig
This patch restores the alphabetic order which was broken by commit 1e0fc9d1eb2b0 ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs") Fixes: 1e0fc9d1eb2b0 ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Acked-by: Balbir Singh <bsingharora@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c9660a18c093..7bf80e214191 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -142,6 +142,7 @@ config PPC
142 select ARCH_HAS_PMEM_API if PPC64 142 select ARCH_HAS_PMEM_API if PPC64
143 select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE 143 select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
144 select ARCH_HAS_SG_CHAIN 144 select ARCH_HAS_SG_CHAIN
145 select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)
145 select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST 146 select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
146 select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64 147 select ARCH_HAS_UACCESS_FLUSHCACHE if PPC64
147 select ARCH_HAS_UBSAN_SANITIZE_ALL 148 select ARCH_HAS_UBSAN_SANITIZE_ALL
@@ -149,6 +150,7 @@ config PPC
149 select ARCH_HAVE_NMI_SAFE_CMPXCHG 150 select ARCH_HAVE_NMI_SAFE_CMPXCHG
150 select ARCH_MIGHT_HAVE_PC_PARPORT 151 select ARCH_MIGHT_HAVE_PC_PARPORT
151 select ARCH_MIGHT_HAVE_PC_SERIO 152 select ARCH_MIGHT_HAVE_PC_SERIO
153 select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
152 select ARCH_SUPPORTS_ATOMIC_RMW 154 select ARCH_SUPPORTS_ATOMIC_RMW
153 select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT 155 select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
154 select ARCH_USE_BUILTIN_BSWAP 156 select ARCH_USE_BUILTIN_BSWAP
@@ -179,8 +181,6 @@ config PPC
179 select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT 181 select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT
180 select HAVE_ARCH_SECCOMP_FILTER 182 select HAVE_ARCH_SECCOMP_FILTER
181 select HAVE_ARCH_TRACEHOOK 183 select HAVE_ARCH_TRACEHOOK
182 select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)
183 select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
184 select HAVE_CBPF_JIT if !PPC64 184 select HAVE_CBPF_JIT if !PPC64
185 select HAVE_CONTEXT_TRACKING if PPC64 185 select HAVE_CONTEXT_TRACKING if PPC64
186 select HAVE_DEBUG_KMEMLEAK 186 select HAVE_DEBUG_KMEMLEAK