From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752039AbeEMRf7 (ORCPT ); Sun, 13 May 2018 13:35:59 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:45242 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbeEMRf5 (ORCPT ); Sun, 13 May 2018 13:35:57 -0400 To: LKML , Linux Edac Mailing List Cc: Andrew Morton , Tony Luck , Borislav Petkov , Mauro Carvalho Chehab From: Randy Dunlap Subject: [PATCH v2] edac: fix skx_edac build error when ACPI_NFIT=m Message-ID: <3af91354-8e19-d2af-1bba-ced8dce053f1@infradead.org> Date: Sun, 13 May 2018 10:35:44 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap 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' Fixes: 58ca9ac1463d ("EDAC, skx_edac: Detect non-volatile DIMMs") Reported-by: kbuild test robot Signed-off-by: Randy Dunlap Cc: Tony Luck Cc: Borislav Petkov Cc: Mauro Carvalho Chehab Cc: stable@vger.kernel.org --- drivers/edac/Kconfig | 1 + 1 file changed, 1 insertion(+) v2: add comment in Kconfig file --- lnx-417-rc4.orig/drivers/edac/Kconfig +++ lnx-417-rc4/drivers/edac/Kconfig @@ -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 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] edac: fix skx_edac build error when ACPI_NFIT=m From: Randy Dunlap Message-Id: <3af91354-8e19-d2af-1bba-ced8dce053f1@infradead.org> Date: Sun, 13 May 2018 10:35:44 -0700 To: LKML , Linux Edac Mailing List Cc: Andrew Morton , Tony Luck , Borislav Petkov , Mauro Carvalho Chehab List-ID: RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpQcmV2ZW50IGJ1aWxk IGVycm9yIHdoZW4gQ09ORklHX0FDUElfTkZJVD1tIGFuZCBDT05GSUdfRURBQ19TS1g9eQpieSBs aW1pdGluZyBFREFDX1NLWCBiYXNlZCBvbiBob3cgQUNQSV9ORklUIGlzIHNldC4KCkZpeGVzIHRo aXMgYnVpbGQgZXJyb3I6CmRyaXZlcnMvZWRhYy9za3hfZWRhYy5vOiBJbiBmdW5jdGlvbiBgZ2V0 X252ZGltbV9pbmZvJzoKLi4vZHJpdmVycy9lZGFjL3NreF9lZGFjLmM6Mzk5OiB1bmRlZmluZWQg cmVmZXJlbmNlIHRvIGBuZml0X2dldF9zbWJpb3NfaWQnCgpGaXhlczogNThjYTlhYzE0NjNkICgi RURBQywgc2t4X2VkYWM6IERldGVjdCBub24tdm9sYXRpbGUgRElNTXMiKQoKUmVwb3J0ZWQtYnk6 IGtidWlsZCB0ZXN0IHJvYm90IDxsa3BAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSYW5keSBE dW5sYXAgPHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KQ2M6IFRvbnkgTHVjayA8dG9ueS5sdWNrQGlu dGVsLmNvbT4KQ2M6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmRlPgpDYzogTWF1cm8gQ2Fy dmFsaG8gQ2hlaGFiIDxtY2hlaGFiQGtlcm5lbC5vcmc+CkNjOiBzdGFibGVAdmdlci5rZXJuZWwu b3JnCi0tLQogZHJpdmVycy9lZGFjL0tjb25maWcgfCAgICAxICsKIDEgZmlsZSBjaGFuZ2VkLCAx IGluc2VydGlvbigrKQoKdjI6IGFkZCBjb21tZW50IGluIEtjb25maWcgZmlsZQoKCi0tClRvIHVu c3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51 eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVs Lm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9y ZG9tby1pbmZvLmh0bWwKCi0tLSBsbngtNDE3LXJjNC5vcmlnL2RyaXZlcnMvZWRhYy9LY29uZmln CisrKyBsbngtNDE3LXJjNC9kcml2ZXJzL2VkYWMvS2NvbmZpZwpAQCAtMjMyLDYgKzIzMiw3IEBA IGNvbmZpZyBFREFDX1NCUklER0UKIGNvbmZpZyBFREFDX1NLWAogCXRyaXN0YXRlICJJbnRlbCBT a3lsYWtlIHNlcnZlciBJbnRlZ3JhdGVkIE1DIgogCWRlcGVuZHMgb24gUENJICYmIFg4Nl82NCAm JiBYODZfTUNFX0lOVEVMICYmIFBDSV9NTUNPTkZJRworCWRlcGVuZHMgb24gQUNQSV9ORklUIHx8 ICFBQ1BJX05GSVQgIyBpZiBBQ1BJX05GSVQ9bSwgRURBQ19TS1ggY2FuJ3QgYmUgeQogCXNlbGVj dCBETUkKIAloZWxwCiAJICBTdXBwb3J0IGZvciBlcnJvciBkZXRlY3Rpb24gYW5kIGNvcnJlY3Rp b24gdGhlIEludGVsCg==