diff options
author | Hitoshi Mitake <h.mitake@gmail.com> | 2008-04-29 04:03:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:26 -0400 |
commit | c3c52bce6993c6d37af2c2de9b482a7013d646a7 (patch) | |
tree | dc03a88574a0029af51aad044c449cb90e52247f /drivers/edac/amd76x_edac.c | |
parent | 1a45027d1afd7e85254b5ef8535e93ce3d588cf4 (diff) |
edac: fix module initialization on several modules 2nd time
I implemented opstate_init() as a inline function in linux/edac.h.
added calling opstate_init() to:
i82443bxgx_edac.c
i82860_edac.c
i82875p_edac.c
i82975x_edac.c
I wrote a fixed patch of
edac-fix-module-initialization-on-several-modules.patch,
and tested building 2.6.25-rc7 with applying this. It was succeed.
I think the patch is now correct.
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac/amd76x_edac.c')
-rw-r--r-- | drivers/edac/amd76x_edac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index f22075410591..2b95f1a3edfc 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/pci_ids.h> | 18 | #include <linux/pci_ids.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/edac.h> | ||
20 | #include "edac_core.h" | 21 | #include "edac_core.h" |
21 | 22 | ||
22 | #define AMD76X_REVISION " Ver: 2.0.2 " __DATE__ | 23 | #define AMD76X_REVISION " Ver: 2.0.2 " __DATE__ |
@@ -344,6 +345,9 @@ static struct pci_driver amd76x_driver = { | |||
344 | 345 | ||
345 | static int __init amd76x_init(void) | 346 | static int __init amd76x_init(void) |
346 | { | 347 | { |
348 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | ||
349 | opstate_init(); | ||
350 | |||
347 | return pci_register_driver(&amd76x_driver); | 351 | return pci_register_driver(&amd76x_driver); |
348 | } | 352 | } |
349 | 353 | ||
@@ -358,3 +362,6 @@ module_exit(amd76x_exit); | |||
358 | MODULE_LICENSE("GPL"); | 362 | MODULE_LICENSE("GPL"); |
359 | MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh"); | 363 | MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh"); |
360 | MODULE_DESCRIPTION("MC support for AMD 76x memory controllers"); | 364 | MODULE_DESCRIPTION("MC support for AMD 76x memory controllers"); |
365 | |||
366 | module_param(edac_op_state, int, 0444); | ||
367 | MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | ||