mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

memory-failure: change type of action_result's param 3 to enum

Browse source 
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@huawei.com>
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Chen Gong <gong.chen@linux.intel.com>
Cc: Jim Davis <jim.epost@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Xie XiuQi 2015-06-24 16:57:33 -07:00 committed by Linus Torvalds
parent cc637b1704
commit cc3e2af42e
2 changed files with 3 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/mm.h
View file

@ -2157,7 +2157,7 @@ extern int soft_offline_page(struct page *page, int flags);
/* /*
* Error handlers for various types of pages. * Error handlers for various types of pages.
*/ */
enum mf_outcome { enum mf_result {
MF_IGNORED, /* Error: cannot be handled */ MF_IGNORED, /* Error: cannot be handled */
MF_FAILED, /* Error: handling failed */ MF_FAILED, /* Error: handling failed */
MF_DELAYED, /* Will be handled later */ MF_DELAYED, /* Will be handled later */

3
mm/memory-failure.c
View file

@ -852,7 +852,8 @@ static struct page_state {
* "Dirty/Clean" indication is not 100% accurate due to the possibility of * "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(). * 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", pr_err("MCE %#lx: recovery action for %s: %s\n",
pfn, action_page_types[type], action_name[result]); pfn, action_page_types[type], action_name[result]);