Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc3e2af4 authored Jun 24, 2015 by Xie XiuQi Committed by Linus Torvalds Jun 24, 2015

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@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>

parent cc637b17

include/linux/mm.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 */

mm/memory-failure.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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]);