From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx157.postini.com [74.125.245.157]) by kanga.kvack.org (Postfix) with SMTP id 02A656B0062 for ; Mon, 9 Jul 2012 06:13:03 -0400 (EDT) Received: by pbbrp2 with SMTP id rp2so23042667pbb.14 for ; Mon, 09 Jul 2012 03:13:03 -0700 (PDT) From: Wanpeng Li Subject: [PATCH] mm/hugetlb: split out is_hugetlb_entry_migration_or_hwpoison Date: Mon, 9 Jul 2012 18:12:41 +0800 Message-Id: <1341828761-11195-1-git-send-email-liwp.linux@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: Michal Hocko , KAMEZAWA Hiroyuki , Mel Gorman , Andrew Morton , linux-kernel@vger.kernel.org, Wanpeng Li From: Wanpeng Li Code was duplicated in two functions, clean it up. Signed-off-by: Wanpeng Li --- mm/hugetlb.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e198831..4f9ce3f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2282,30 +2282,28 @@ nomem: return -ENOMEM; } -static int is_hugetlb_entry_migration(pte_t pte) +static int is_hugetlb_entry_migration_or_hwpoison(pte_t pte, bool migration) { swp_entry_t swp; if (huge_pte_none(pte) || pte_present(pte)) return 0; swp = pte_to_swp_entry(pte); - if (non_swap_entry(swp) && is_migration_entry(swp)) + if (non_swap_entry(pte) && ((migration && is_migration_entry(pte)) + || !migration && is_hwpoison_entry(pte))) return 1; else return 0; } -static int is_hugetlb_entry_hwpoisoned(pte_t pte) +static int is_hugetlb_entry_migration(pte_t pte) { - swp_entry_t swp; + return is_hugetlb_entry_migration_or_hwpoison(pte, true); +} - if (huge_pte_none(pte) || pte_present(pte)) - return 0; - swp = pte_to_swp_entry(pte); - if (non_swap_entry(swp) && is_hwpoison_entry(swp)) - return 1; - else - return 0; +static int is_hugetlb_entry_hwpoisoned(pte_t pte) +{ + return is_hugetlb_entry_migration_or_hwpoison(pte, false); } void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, -- 1.7.5.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org