diff options
| author | Luck, Tony <tony.luck@intel.com> | 2018-11-06 10:39:15 -0800 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2018-11-07 22:58:29 +0100 |
| commit | 24c9d423e86b17b25b4b510e81f10aa232fdaa60 (patch) | |
| tree | a4cf141b67df911dd598744e57bc09288ca32200 /drivers | |
| parent | 96c1c58eb0d715d3f66f374bb07aa96cb7cdd1fa (diff) | |
| download | talos-obmc-linux-24c9d423e86b17b25b4b510e81f10aa232fdaa60.tar.gz talos-obmc-linux-24c9d423e86b17b25b4b510e81f10aa232fdaa60.zip | |
EDAC, skx: Fix randconfig builds in a better way
It was previously noted that Kconfig complained about unmet dependencies
when trying to configure skx_edac together with CONFIG_ACPI=n. First fix
for this checked for ACPI when doing
select ACPI_ADXL
but this required stub functions for the case where ACPI wasn't
selected. It also allowed building a driver that didn't actually work
for a system that has non-volatile DIMMs.
Arnd Bergmann pointed out that the right fix is to make EDAC_SKX
"depend on ACPI".
Fixes: a324e9396ca3 ("EDAC, skx: Fix randconfig builds")
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Mauro Carvalho Chehab <mchehab@kernel.org>
CC: linux-edac <linux-edac@vger.kernel.org>
CC: qiuxu.zhuo@intel.com
Link: http://lkml.kernel.org/r/20181106183914.GA26731@agluck-desk
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index ec2727b27556..e286b5b99003 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -231,10 +231,10 @@ config EDAC_SBRIDGE config EDAC_SKX tristate "Intel Skylake server Integrated MC" - depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG + depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG && ACPI depends on ACPI_NFIT || !ACPI_NFIT # if ACPI_NFIT=m, EDAC_SKX can't be y select DMI - select ACPI_ADXL if ACPI + select ACPI_ADXL help Support for error detection and correction the Intel Skylake server Integrated Memory Controllers. If your |
