x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to arch/Kconfig

powerpc is also going to use this feature, so put it in a generic location.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190806044919.10622-2-bauerman@linux.ibm.com

diff --git a/arch/Kconfig b/arch/Kconfig
index a7b57dd42c26698b319430ac65cd81610ba08b71..89e2e3f64f791960715e43552b67f9f29ce6e632 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -925,6 +925,9 @@ config LOCK_EVENT_COUNTS
          the chance of application behavior change because of timing
          differences. The counts are reported via debugfs.
 
+config ARCH_HAS_MEM_ENCRYPT
+       bool
+
 source "kernel/gcov/Kconfig"
 
 source "scripts/gcc-plugins/Kconfig"

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a4ad2733eedf652d7f215b3091341f1e1d938571..f43319c444548eaaabf2202c7eb8786fcee41457 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-config ARCH_HAS_MEM_ENCRYPT
-        def_bool y
-
 config MMU
        def_bool y
 
@@ -68,6 +65,7 @@ config S390
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_GIGANTIC_PAGE
        select ARCH_HAS_KCOV
+       select ARCH_HAS_MEM_ENCRYPT
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_STRICT_KERNEL_RWX

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 222855cc0158422f1d6dddc2d9307cb606433a37..06027809c59990153f14d57b29a7cee11dc4ea00 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -68,6 +68,7 @@ config X86
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_KCOV                    if X86_64
+       select ARCH_HAS_MEM_ENCRYPT
        select ARCH_HAS_MEMBARRIER_SYNC_CORE
        select ARCH_HAS_PMEM_API                if X86_64
        select ARCH_HAS_PTE_DEVMAP              if X86_64
@@ -1518,9 +1519,6 @@ config X86_CPA_STATISTICS
          helps to determine the effectiveness of preserving large and huge
          page mappings when mapping protections are changed.
 
-config ARCH_HAS_MEM_ENCRYPT
-       def_bool y
-
 config AMD_MEM_ENCRYPT
        bool "AMD Secure Memory Encryption (SME) support"
        depends on X86_64 && CPU_SUP_AMD