From abaf9b3585f91eb2f68ad9825c814498b6b116ce Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Fri, 17 Jan 2020 12:30:20 +0100 Subject: [PATCH] EDAC/amd64: Do not warn when removing instances mainline inclusion from mainline-v5.6-rc1 commit 7e5d6cf35329c8b232a1e97114545c1745d79083 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICQYTX CVE: NA Reference: https://git.kernel.org/torvalds/c/7e5d6cf35329c8b232a1e97114545c1745d79083 --------------------------- commit 7e5d6cf35329c8b232a1e97114545c1745d79083 upstream. On machines which do not populate all nodes with DIMMs, the driver doesn't initialize an instance there. However, the instance removal remove_one_instance() path will warn unconditionally, which is wrong. Remove the WARN_ON() even if the warning is innocent because it causes a splat in dmesg. Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20200117115939.5524-1-bp@alien8.de --- drivers/edac/amd64_edac.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d0925daffb99..5c6586845b91 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3798,9 +3798,6 @@ static void remove_one_instance(unsigned int nid) struct mem_ctl_info *mci; struct amd64_pvt *pvt; - mci = find_mci_by_dev(&F3->dev); - WARN_ON(!mci); - /* Remove from EDAC CORE tracking list */ mci = edac_mc_del_mc(&F3->dev); if (!mci) -- Gitee