From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail203.messagelabs.com (mail203.messagelabs.com [216.82.254.243]) by kanga.kvack.org (Postfix) with ESMTP id ABCFA6B004A for ; Thu, 18 Nov 2010 19:40:24 -0500 (EST) From: David Sterba Subject: [PATCH] mm: remove call to find_vma in pagewalk for non-hugetlbfs Date: Fri, 19 Nov 2010 01:39:57 +0100 Message-Id: <1290127197-20360-1-git-send-email-dsterba@suse.cz> Sender: owner-linux-mm@kvack.org To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Sterba , Naoya Horiguchi , Andi Kleen , Andy Whitcroft , David Rientjes , Hugh Dickins , Lee Schermerhorn , Matt Mackall , Mel Gorman , Wu Fengguang List-ID: Commit d33b9f45 introduces a check if a vma is a hugetlbfs one and later in 5dc37642 is moved under #ifdef CONFIG_HUGETLB_PAGE but a needless find_vma call is left behind and it's result not used anywhere else in the function. The sideefect of caching vma for @addr inside walk->mm is neither utilized in walk_page_range() nor in called functions. Signed-off-by: David Sterba Cc: Naoya Horiguchi Cc: Andi Kleen Cc: Andy Whitcroft Cc: David Rientjes Cc: Hugh Dickins Cc: Lee Schermerhorn Cc: Matt Mackall Cc: Mel Gorman Cc: Wu Fengguang --- mm/pagewalk.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 8b1a2ce..38cc58b 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -139,7 +139,6 @@ int walk_page_range(unsigned long addr, unsigned long end, pgd_t *pgd; unsigned long next; int err = 0; - struct vm_area_struct *vma; if (addr >= end) return err; @@ -149,15 +148,17 @@ int walk_page_range(unsigned long addr, unsigned long end, pgd = pgd_offset(walk->mm, addr); do { + struct vm_area_struct *uninitialized_var(vma); + next = pgd_addr_end(addr, end); +#ifdef CONFIG_HUGETLB_PAGE /* * handle hugetlb vma individually because pagetable walk for * the hugetlb page is dependent on the architecture and * we can't handled it in the same manner as non-huge pages. */ vma = find_vma(walk->mm, addr); -#ifdef CONFIG_HUGETLB_PAGE if (vma && is_vm_hugetlb_page(vma)) { if (vma->vm_end < next) next = vma->vm_end; -- 1.7.1 -- 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/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org