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/pasemi_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/pasemi_edac.c')
-rw-r--r-- | drivers/edac/pasemi_edac.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c index 90320917be28..3fd65a563848 100644 --- a/drivers/edac/pasemi_edac.c +++ b/drivers/edac/pasemi_edac.c | |||
@@ -284,6 +284,9 @@ static struct pci_driver pasemi_edac_driver = { | |||
284 | 284 | ||
285 | static int __init pasemi_edac_init(void) | 285 | static int __init pasemi_edac_init(void) |
286 | { | 286 | { |
287 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | ||
288 | opstate_init(); | ||
289 | |||
287 | return pci_register_driver(&pasemi_edac_driver); | 290 | return pci_register_driver(&pasemi_edac_driver); |
288 | } | 291 | } |
289 | 292 | ||
@@ -298,3 +301,6 @@ module_exit(pasemi_edac_exit); | |||
298 | MODULE_LICENSE("GPL"); | 301 | MODULE_LICENSE("GPL"); |
299 | MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>"); | 302 | MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>"); |
300 | MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller"); | 303 | MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller"); |
304 | module_param(edac_op_state, int, 0444); | ||
305 | MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | ||
306 | |||