The patch titled
drivers/edac: mod assert_error check
has been removed from the -mm tree. Its filename was
drivers-edac-mod-assert_error-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers/edac: mod assert_error check
From: Dave Jiang <djiang@xxxxxxxxxx>
Change error check and clear variable from an atomic to an int
Signed-off-by: Dave Jiang <djiang@xxxxxxxxxx>
Signed-off-by: Douglas Thompson <dougthompson@xxxxxxxxxxxx
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/edac_mc.c | 11 ++++-------
drivers/edac/edac_stub.c | 4 ++--
include/linux/edac.h | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
diff -puN drivers/edac/edac_mc.c~drivers-edac-mod-assert_error-check drivers/edac/edac_mc.c
--- a/drivers/edac/edac_mc.c~drivers-edac-mod-assert_error-check
+++ a/drivers/edac/edac_mc.c
@@ -222,18 +222,15 @@ static struct mem_ctl_info *find_mci_by_
*/
static int edac_mc_assert_error_check_and_clear(void)
{
- int vreg;
+ int old_state;
if(edac_op_state == EDAC_OPSTATE_POLL)
return 1;
- vreg = atomic_read(&edac_err_assert);
- if(vreg) {
- atomic_set(&edac_err_assert, 0);
- return 1;
- }
+ old_state = edac_err_assert;
+ edac_err_assert = 0;
- return 0;
+ return old_state;
}
/*
diff -puN drivers/edac/edac_stub.c~drivers-edac-mod-assert_error-check drivers/edac/edac_stub.c
--- a/drivers/edac/edac_stub.c~drivers-edac-mod-assert_error-check
+++ a/drivers/edac/edac_stub.c
@@ -20,7 +20,7 @@ EXPORT_SYMBOL(edac_op_state);
atomic_t edac_handlers = ATOMIC_INIT(0);
EXPORT_SYMBOL(edac_handlers);
-atomic_t edac_err_assert = ATOMIC_INIT(0);
+int edac_err_assert = 0;
EXPORT_SYMBOL(edac_err_assert);
inline int edac_handler_set(void)
@@ -37,6 +37,6 @@ EXPORT_SYMBOL(edac_handler_set);
*/
inline void edac_atomic_assert_error(void)
{
- atomic_set(&edac_err_assert, 1);
+ edac_err_assert++;
}
EXPORT_SYMBOL(edac_atomic_assert_error);
diff -puN include/linux/edac.h~drivers-edac-mod-assert_error-check include/linux/edac.h
--- a/include/linux/edac.h~drivers-edac-mod-assert_error-check
+++ a/include/linux/edac.h
@@ -20,8 +20,8 @@
#define EDAC_OPSTATE_INT 2
extern int edac_op_state;
+extern int edac_err_assert;
extern atomic_t edac_handlers;
-extern atomic_t edac_err_assert;
extern int edac_handler_set(void);
extern void edac_atomic_assert_error(void);
_
Patches currently in -mm which might be from djiang@xxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
