On Mon, Apr 20, 2015 at 04:44:39PM +0800, Xie XiuQi wrote: > 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 <[email protected]>
Acked-by: Naoya Horiguchi <[email protected]> > --- > include/linux/mm.h | 2 +- > mm/memory-failure.c | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 8413615..93c4a00 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2156,7 +2156,7 @@ extern int soft_offline_page(struct page *page, int > flags); > /* > * 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 --git a/mm/memory-failure.c b/mm/memory-failure.c > index 6f5748d..f074f8e 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -847,7 +847,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]); > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
