git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (13845): smsdvb: Fix the frequency switch that broke with v5 API conversion
[safe/jmp/linux-2.6]
/
drivers
/
edac
/
amd76x_edac.c
diff --git
a/drivers/edac/amd76x_edac.c
b/drivers/edac/amd76x_edac.c
index
f220754
..
2b95f1a
100644
(file)
--- a/
drivers/edac/amd76x_edac.c
+++ b/
drivers/edac/amd76x_edac.c
@@
-17,6
+17,7
@@
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/slab.h>
+#include <linux/edac.h>
#include "edac_core.h"
#define AMD76X_REVISION " Ver: 2.0.2 " __DATE__
#include "edac_core.h"
#define AMD76X_REVISION " Ver: 2.0.2 " __DATE__
@@
-344,6
+345,9
@@
static struct pci_driver amd76x_driver = {
static int __init amd76x_init(void)
{
static int __init amd76x_init(void)
{
+ /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+ opstate_init();
+
return pci_register_driver(&amd76x_driver);
}
return pci_register_driver(&amd76x_driver);
}
@@
-358,3
+362,6
@@
module_exit(amd76x_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
MODULE_DESCRIPTION("MC support for AMD 76x memory controllers");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
MODULE_DESCRIPTION("MC support for AMD 76x memory controllers");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");