diff options
-rw-r--r-- | drivers/edac/edac_module.c | 9 | ||||
-rw-r--r-- | drivers/edac/edac_stub.c | 20 |
2 files changed, 16 insertions, 13 deletions
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c index fc32bbb9405e..e0c4a4086055 100644 --- a/drivers/edac/edac_module.c +++ b/drivers/edac/edac_module.c | |||
@@ -1,12 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * edac_module.c | 2 | * edac_module.c |
3 | * | 3 | * |
4 | * (C) 2007 www.douglaskthompson.com | 4 | * (C) 2007 www.softwarebitmaker.com |
5 | * | ||
5 | * This file is licensed under the terms of the GNU General Public | 6 | * This file is licensed under the terms of the GNU General Public |
6 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
7 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
8 | * | 9 | * |
9 | * Author: Doug Thompson <norsk5@xmission.com> | 10 | * Author: Doug Thompson <dougthompson@xmission.com> |
10 | * | 11 | * |
11 | */ | 12 | */ |
12 | #include <linux/edac.h> | 13 | #include <linux/edac.h> |
@@ -14,7 +15,7 @@ | |||
14 | #include "edac_core.h" | 15 | #include "edac_core.h" |
15 | #include "edac_module.h" | 16 | #include "edac_module.h" |
16 | 17 | ||
17 | #define EDAC_MC_VERSION "Ver: 2.0.5 " __DATE__ | 18 | #define EDAC_VERSION "Ver: 2.1.0 " __DATE__ |
18 | 19 | ||
19 | #ifdef CONFIG_EDAC_DEBUG | 20 | #ifdef CONFIG_EDAC_DEBUG |
20 | /* Values of 0 to 4 will generate output */ | 21 | /* Values of 0 to 4 will generate output */ |
@@ -141,7 +142,7 @@ static int __init edac_init(void) | |||
141 | { | 142 | { |
142 | int err = 0; | 143 | int err = 0; |
143 | 144 | ||
144 | edac_printk(KERN_INFO, EDAC_MC, EDAC_MC_VERSION "\n"); | 145 | edac_printk(KERN_INFO, EDAC_MC, EDAC_VERSION "\n"); |
145 | 146 | ||
146 | /* | 147 | /* |
147 | * Harvest and clear any boot/initialization PCI parity errors | 148 | * Harvest and clear any boot/initialization PCI parity errors |
diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c index 77b98dd3cfa6..20b428aa155e 100644 --- a/drivers/edac/edac_stub.c +++ b/drivers/edac/edac_stub.c | |||
@@ -15,30 +15,32 @@ | |||
15 | #include <asm/edac.h> | 15 | #include <asm/edac.h> |
16 | 16 | ||
17 | int edac_op_state = EDAC_OPSTATE_INVAL; | 17 | int edac_op_state = EDAC_OPSTATE_INVAL; |
18 | EXPORT_SYMBOL(edac_op_state); | 18 | EXPORT_SYMBOL_GPL(edac_op_state); |
19 | 19 | ||
20 | atomic_t edac_handlers = ATOMIC_INIT(0); | 20 | atomic_t edac_handlers = ATOMIC_INIT(0); |
21 | EXPORT_SYMBOL(edac_handlers); | 21 | EXPORT_SYMBOL_GPL(edac_handlers); |
22 | 22 | ||
23 | int edac_err_assert = 0; | 23 | int edac_err_assert = 0; |
24 | EXPORT_SYMBOL(edac_err_assert); | 24 | EXPORT_SYMBOL_GPL(edac_err_assert); |
25 | 25 | ||
26 | inline int edac_handler_set(void) | 26 | /* |
27 | * called to determine if there is an EDAC driver interested in | ||
28 | * knowing an event (such as NMI) occurred | ||
29 | */ | ||
30 | int edac_handler_set(void) | ||
27 | { | 31 | { |
28 | if (edac_op_state == EDAC_OPSTATE_POLL) | 32 | if (edac_op_state == EDAC_OPSTATE_POLL) |
29 | return 0; | 33 | return 0; |
30 | 34 | ||
31 | return atomic_read(&edac_handlers); | 35 | return atomic_read(&edac_handlers); |
32 | } | 36 | } |
33 | 37 | EXPORT_SYMBOL_GPL(edac_handler_set); | |
34 | EXPORT_SYMBOL(edac_handler_set); | ||
35 | 38 | ||
36 | /* | 39 | /* |
37 | * handler for NMI type of interrupts to assert error | 40 | * handler for NMI type of interrupts to assert error |
38 | */ | 41 | */ |
39 | inline void edac_atomic_assert_error(void) | 42 | void edac_atomic_assert_error(void) |
40 | { | 43 | { |
41 | edac_err_assert++; | 44 | edac_err_assert++; |
42 | } | 45 | } |
43 | 46 | EXPORT_SYMBOL_GPL(edac_atomic_assert_error); | |
44 | EXPORT_SYMBOL(edac_atomic_assert_error); | ||