Skip to content

Commit

Permalink
i7core_edac: MCE NMI handling should stop first
Browse files Browse the repository at this point in the history
Otherwise, a NMI may happen causing a race condition and a panic.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Oct 24, 2010
1 parent 6ee7dd5 commit 41ba6c1
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/edac/i7core_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}
}
Expand Down

0 comments on commit 41ba6c1

Please sign in to comment.