diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2018-05-13 13:35:44 -0400 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2018-05-14 05:35:23 -0400 |
| commit | de245ae073e72d47304fda3db13b24dacda204ee (patch) | |
| tree | a77c7194178d56f76700f54431e9fc99ecc80b41 | |
| parent | a0671c39ddf4ebe464dc49da7e48860ff4135920 (diff) | |
EDAC, skx: Fix skx_edac build error when ACPI_NFIT=m
Prevent build error when CONFIG_ACPI_NFIT=m and CONFIG_EDAC_SKX=y by
limiting EDAC_SKX based on how ACPI_NFIT is set.
Fixes this build error:
drivers/edac/skx_edac.o: In function `get_nvdimm_info':
../drivers/edac/skx_edac.c:399: undefined reference to `nfit_get_smbios_id'
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Fixes: 58ca9ac1463d ("EDAC, skx_edac: Detect non-volatile DIMMs")
Link: http://lkml.kernel.org/r/3af91354-8e19-d2af-1bba-ced8dce053f1@infradead.org
Signed-off-by: Borislav Petkov <bp@suse.de>
| -rw-r--r-- | drivers/edac/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index ac40b0f1e480..57304b2e989f 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
| @@ -232,6 +232,7 @@ config EDAC_SBRIDGE | |||
| 232 | config EDAC_SKX | 232 | config EDAC_SKX |
| 233 | tristate "Intel Skylake server Integrated MC" | 233 | tristate "Intel Skylake server Integrated MC" |
| 234 | depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG | 234 | depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG |
| 235 | depends on ACPI_NFIT || !ACPI_NFIT # if ACPI_NFIT=m, EDAC_SKX can't be y | ||
| 235 | select DMI | 236 | select DMI |
| 236 | help | 237 | help |
| 237 | Support for error detection and correction the Intel | 238 | Support for error detection and correction the Intel |