Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8e0b76ad8350d78c8a9486c6045b97bf0b4e2f17..d05a42357ef0f5d02e27e630292998d0eba019b2 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -27,6 +27,7 @@ config X86
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FAST_MULTIPLIER
        select ARCH_HAS_GCOV_PROFILE_ALL
+       select ARCH_HAS_PMEM_API
        select ARCH_HAS_SG_CHAIN
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_MIGHT_HAVE_ACPI_PDC         if ACPI
@@ -1055,24 +1056,19 @@ config TOSHIBA
          Say N otherwise.
 
 config I8K
-       tristate "Dell laptop support"
+       tristate "Dell i8k legacy laptop support"
        select HWMON
+       select SENSORS_DELL_SMM
        ---help---
-         This adds a driver to safely access the System Management Mode
-         of the CPU on the Dell Inspiron 8000. The System Management Mode
-         is used to read cpu temperature and cooling fan status and to
-         control the fans on the I8K portables.
+         This option enables legacy /proc/i8k userspace interface in hwmon
+         dell-smm-hwmon driver. Character file /proc/i8k reports bios version,
+         temperature and allows controlling fan speeds of Dell laptops via
+         System Management Mode. For old Dell laptops (like Dell Inspiron 8000)
+         it reports also power and hotkey status. For fan speed control is
+         needed userspace package i8kutils.
 
-         This driver has been tested only on the Inspiron 8000 but it may
-         also work with other Dell laptops. You can force loading on other
-         models by passing the parameter `force=1' to the module. Use at
-         your own risk.
-
-         For information on utilities to make use of this driver see the
-         I8K Linux utilities web site at:
-         <http://people.debian.org/~dz/i8k/>
-
-         Say Y if you intend to run this kernel on a Dell Inspiron 8000.
+         Say Y if you intend to run this kernel on old Dell laptops or want to
+         use userspace package i8kutils.
          Say N otherwise.
 
 config X86_REBOOTFIXUPS
@@ -1424,6 +1420,9 @@ source "mm/Kconfig"
 
 config X86_PMEM_LEGACY
        bool "Support non-standard NVDIMMs and ADR protected memory"
+       depends on PHYS_ADDR_T_64BIT
+       depends on BLK_DEV
+       select LIBNVDIMM
        help
          Treat memory marked using the non-standard e820 type of 12 as used
          by the Intel Sandy Bridge-EP reference BIOS as protected memory.