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: a324e9396c ("EDAC, skx: Fix randconfig builds")
Signed-off-by: Tony Luck <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
CC: "Rafael J. Wysocki" <[email protected]>
CC: Arnd Bergmann <[email protected]>
CC: Mauro Carvalho Chehab <[email protected]>
CC: linux-edac <[email protected]>
CC: [email protected]
Link: http://lkml.kernel.org/r/20181106183914.GA26731@agluck-desk
This commit is contained in:
Luck, Tony 2018-11-06 10:39:15 -08:00 • committed by Borislav Petkov
commit 24c9d423e8
2 changed files with 2 additions and 7 deletions

View file

@ -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