dma-direct: Force unencrypted DMA under SME for certain DMA masks

[linux-2.6-microblaze.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9df2d1c..d1afe92 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1528,6 +1528,7 @@ config AMD_MEM_ENCRYPT
        depends on X86_64 && CPU_SUP_AMD
        select DYNAMIC_PHYSICAL_MASK
        select ARCH_USE_MEMREMAP_PROT
        depends on X86_64 && CPU_SUP_AMD
        select DYNAMIC_PHYSICAL_MASK
        select ARCH_USE_MEMREMAP_PROT

+       select ARCH_HAS_FORCE_DMA_UNENCRYPTED

        ---help---
          Say yes to enable support for the encryption of system memory.
          This requires an AMD processor that supports Secure Memory
        ---help---
          Say yes to enable support for the encryption of system memory.
          This requires an AMD processor that supports Secure Memory


@@ -2482,7 +2483,7 @@ menuconfig APM
          machines with more than one CPU.
 
          In order to use APM, you will need supporting software. For location
          machines with more than one CPU.
 
          In order to use APM, you will need supporting software. For location

-         and more information, read <file:Documentation/power/apm-acpi.txt>
+         and more information, read <file:Documentation/power/apm-acpi.rst>

          and the Battery Powered Linux mini-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          and the Battery Powered Linux mini-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 


@@ -2733,6 +2734,7 @@ config OLPC
        select OF
        select OF_PROMTREE
        select IRQ_DOMAIN
        select OF
        select OF_PROMTREE
        select IRQ_DOMAIN

+       select OLPC_EC

        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.
        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.