dect
/
linux-2.6
Archived
13
0
Fork 0

i7core_edac: MCE NMI handling should stop first

Otherwise, a NMI may happen causing a race condition and a panic.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-08-11 00:58:11 -03:00
parent 6ee7dd5044
commit 41ba6c1058
1 changed files with 8 additions and 1 deletions

View File

@ -2070,6 +2070,10 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
__func__, mci, &i7core_dev->pdev[0]->dev);
/* Disable MCE NMI handler */
edac_mce_unregister(&pvt->edac_mce);
/* Disable EDAC polling */
if (likely(pvt->i7core_pci))
edac_pci_release_generic_ctl(pvt->i7core_pci);
else
@ -2078,11 +2082,14 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
i7core_dev->socket);
pvt->i7core_pci = NULL;
/* Remove MC sysfs nodes */
edac_mc_del_mc(&i7core_dev->pdev[0]->dev);
edac_mce_unregister(&pvt->edac_mce);
/* Free data */
kfree(mci->ctl_name);
edac_mc_free(mci);
/* Release PCI resources */
i7core_put_devices(i7core_dev);
}
}