aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorDave Jiang <djiang@mvista.com>2007-07-19 04:49:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:54 -0400
commit66ee2f940ac8ab25f0c43a1e717d25dc46bfe74d (patch)
tree929e24aefc27c95e13641a8f4052d9093a1ef34a /drivers/edac
parent91b99041c1d577ded1da599ddc28cec2e07253cf (diff)
drivers/edac: mod assert_error check
Change error check and clear variable from an atomic to an int Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Douglas 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')
-rw-r--r--drivers/edac/edac_mc.c11
-rw-r--r--drivers/edac/edac_stub.c4
2 files changed, 6 insertions, 9 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 3474ca9d90a4..7c952c68f0d6 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -222,18 +222,15 @@ static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
222 */ 222 */
223static int edac_mc_assert_error_check_and_clear(void) 223static int edac_mc_assert_error_check_and_clear(void)
224{ 224{
225 int vreg; 225 int old_state;
226 226
227 if(edac_op_state == EDAC_OPSTATE_POLL) 227 if(edac_op_state == EDAC_OPSTATE_POLL)
228 return 1; 228 return 1;
229 229
230 vreg = atomic_read(&edac_err_assert); 230 old_state = edac_err_assert;
231 if(vreg) { 231 edac_err_assert = 0;
232 atomic_set(&edac_err_assert, 0);
233 return 1;
234 }
235 232
236 return 0; 233 return old_state;
237} 234}
238 235
239/* 236/*
diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c
index 91a038d2f652..3d259c231507 100644
--- a/drivers/edac/edac_stub.c
+++ b/drivers/edac/edac_stub.c
@@ -20,7 +20,7 @@ EXPORT_SYMBOL(edac_op_state);
20atomic_t edac_handlers = ATOMIC_INIT(0); 20atomic_t edac_handlers = ATOMIC_INIT(0);
21EXPORT_SYMBOL(edac_handlers); 21EXPORT_SYMBOL(edac_handlers);
22 22
23atomic_t edac_err_assert = ATOMIC_INIT(0); 23int edac_err_assert = 0;
24EXPORT_SYMBOL(edac_err_assert); 24EXPORT_SYMBOL(edac_err_assert);
25 25
26inline int edac_handler_set(void) 26inline int edac_handler_set(void)
@@ -37,6 +37,6 @@ EXPORT_SYMBOL(edac_handler_set);
37 */ 37 */
38inline void edac_atomic_assert_error(void) 38inline void edac_atomic_assert_error(void)
39{ 39{
40 atomic_set(&edac_err_assert, 1); 40 edac_err_assert++;
41} 41}
42EXPORT_SYMBOL(edac_atomic_assert_error); 42EXPORT_SYMBOL(edac_atomic_assert_error);