首頁 探索 說明
登入
GfA
/
linux_kernel
5
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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>
Christophe Leroy 7 年之前
父節點
cef37ac119
當前提交
4ec591e51a
共有 1 個文件被更改，包括 2 次插入 和 2 次删除
分割檢視 顯示文件統計
  1. 2 2
      arch/powerpc/Kconfig

+ 2 - 2
arch/powerpc/Kconfig
查看文件 

@@ -142,6 +142,7 @@ config PPC
 
 	select ARCH_HAS_PMEM_API                if PPC64
 
 	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_UACCESS_FLUSHCACHE	if PPC64
 
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 
@@ -149,6 +150,7 @@ config PPC
 
 	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
 
@@ -179,8 +181,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