The patch titled
Subject: memory-failure: change type of action_result's param 3 to enum
has been removed from the -mm tree. Its filename was
memory-failure-change-type-of-action_results-param-3-to-enum.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xie XiuQi <xiexiuqi@xxxxxxxxxx>
Subject: memory-failure: change type of action_result's param 3 to enum
Change type of action_result's param 3 to enum for type consistency,
and rename mf_outcome to mf_result for clearly.
Signed-off-by: Xie XiuQi <xiexiuqi@xxxxxxxxxx>
Acked-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Chen Gong <gong.chen@xxxxxxxxxxxxxxx>
Cc: Jim Davis <jim.epost@xxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 2 +-
mm/memory-failure.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN include/linux/mm.h~memory-failure-change-type-of-action_results-param-3-to-enum include/linux/mm.h
--- a/include/linux/mm.h~memory-failure-change-type-of-action_results-param-3-to-enum
+++ a/include/linux/mm.h
@@ -2157,7 +2157,7 @@ extern int soft_offline_page(struct page
/*
* Error handlers for various types of pages.
*/
-enum mf_outcome {
+enum mf_result {
MF_IGNORED, /* Error: cannot be handled */
MF_FAILED, /* Error: handling failed */
MF_DELAYED, /* Will be handled later */
diff -puN mm/memory-failure.c~memory-failure-change-type-of-action_results-param-3-to-enum mm/memory-failure.c
--- a/mm/memory-failure.c~memory-failure-change-type-of-action_results-param-3-to-enum
+++ a/mm/memory-failure.c
@@ -852,7 +852,8 @@ static struct page_state {
* "Dirty/Clean" indication is not 100% accurate due to the possibility of
* setting PG_dirty outside page lock. See also comment above set_page_dirty().
*/
-static void action_result(unsigned long pfn, enum mf_action_page_type type, int result)
+static void action_result(unsigned long pfn, enum mf_action_page_type type,
+ enum mf_result result)
{
pr_err("MCE %#lx: recovery action for %s: %s\n",
pfn, action_page_types[type], action_name[result]);
_
Patches currently in -mm which might be from xiexiuqi@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
