git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
drivers
/
edac
/
i82860_edac.c
diff --git
a/drivers/edac/i82860_edac.c
b/drivers/edac/i82860_edac.c
index
f5ecd2c
..
b8a95cf
100644
(file)
--- a/
drivers/edac/i82860_edac.c
+++ b/
drivers/edac/i82860_edac.c
@@
-13,7
+13,7
@@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
-#include <linux/
slab
.h>
+#include <linux/
edac
.h>
#include "edac_core.h"
#define I82860_REVISION " Ver: 2.0.2 " __DATE__
#include "edac_core.h"
#define I82860_REVISION " Ver: 2.0.2 " __DATE__
@@
-294,6
+294,9
@@
static int __init i82860_init(void)
debugf3("%s()\n", __func__);
debugf3("%s()\n", __func__);
+ /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+ opstate_init();
+
if ((pci_rc = pci_register_driver(&i82860_driver)) < 0)
goto fail0;
if ((pci_rc = pci_register_driver(&i82860_driver)) < 0)
goto fail0;
@@
-345,3
+348,6
@@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) "
"Ben Woodard <woodard@redhat.com>");
MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");
MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) "
"Ben Woodard <woodard@redhat.com>");
MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");