Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754912AbbEUDpN (ORCPT ); Wed, 20 May 2015 23:45:13 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:40078 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754048AbbEUDpF (ORCPT ); Wed, 20 May 2015 23:45:05 -0400 From: Xie XiuQi To: , CC: , , , , , , , , , , Subject: [PATCH v6 2/5] memory-failure: change type of action_result's param 3 to enum Date: Thu, 21 May 2015 11:41:22 +0800 Message-ID: <1432179685-11369-3-git-send-email-xiexiuqi@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1432179685-11369-1-git-send-email-xiexiuqi@huawei.com> References: <1432179685-11369-1-git-send-email-xiexiuqi@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1680 Lines: 45 Change type of action_result's param 3 to enum for type consistency, and rename mf_outcome to mf_result for clearly. Acked-by: Naoya Horiguchi Signed-off-by: Xie XiuQi --- 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 3abf13c..0632dea 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 5650dec..a3f7ea2 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.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/