From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754576Ab3KTRwD (ORCPT ); Wed, 20 Nov 2013 12:52:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60449 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753041Ab3KTRvu (ORCPT ); Wed, 20 Nov 2013 12:51:50 -0500 From: Andrea Arcangeli To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Khalid Aziz , Pravin Shelar , Greg Kroah-Hartman , Ben Hutchings , Christoph Lameter , Johannes Weiner , Mel Gorman , Rik van Riel , Andi Kleen , Minchan Kim , Linus Torvalds Subject: [PATCH 6/8] mm/hugetlb.c: simplify PageHeadHuge() and PageHuge() Date: Wed, 20 Nov 2013 18:51:14 +0100 Message-Id: <1384969876-6374-7-git-send-email-aarcange@redhat.com> In-Reply-To: <1384969876-6374-1-git-send-email-aarcange@redhat.com> References: <1384969876-6374-1-git-send-email-aarcange@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Andrea Arcangeli --- mm/hugetlb.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f03e068..9b8a14b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -724,15 +724,11 @@ static void prep_compound_gigantic_page(struct page *page, unsigned long order) */ int PageHuge(struct page *page) { - compound_page_dtor *dtor; - if (!PageCompound(page)) return 0; page = compound_head(page); - dtor = get_compound_page_dtor(page); - - return dtor == free_huge_page; + return get_compound_page_dtor(page) == free_huge_page; } EXPORT_SYMBOL_GPL(PageHuge); @@ -742,14 +738,10 @@ EXPORT_SYMBOL_GPL(PageHuge); */ int PageHeadHuge(struct page *page_head) { - compound_page_dtor *dtor; - if (!PageHead(page_head)) return 0; - dtor = get_compound_page_dtor(page_head); - - return dtor == free_huge_page; + return get_compound_page_dtor(page_head) == free_huge_page; } EXPORT_SYMBOL_GPL(PageHeadHuge);