Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de245ae0 authored by Randy Dunlap's avatar Randy Dunlap Committed by Borislav Petkov
Browse files

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: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarRandy 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: 58ca9ac1 ("EDAC, skx_edac: Detect non-volatile DIMMs")
Link: http://lkml.kernel.org/r/3af91354-8e19-d2af-1bba-ced8dce053f1@infradead.org


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent a0671c39

drivers/edac/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ config EDAC_SBRIDGE 
config EDAC_SKX

	tristate "Intel Skylake server Integrated MC"

	depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG

	depends on ACPI_NFIT || !ACPI_NFIT # if ACPI_NFIT=m, EDAC_SKX can't be y

	select DMI

	help

	  Support for error detection and correction the Intel