diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2011-11-02 16:37:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 19:06:57 -0400 |
commit | 2839bdc1bfc0af76a2f0f11eca011590520a04fa (patch) | |
tree | 8dddcc4c964e50cb5067bfd23f3fb660400dbc2b /arch/powerpc/mm | |
parent | 70b50f94f1644e2aa7cb374819cfd93f3c28d725 (diff) |
powerpc: remove superfluous PageTail checks on the pte gup_fast
This part of gup_fast doesn't seem capable of handling hugetlbfs ptes,
those should be handled by gup_hugepd only, so these checks are
superfluous.
Plus if this wasn't a noop, it would have oopsed because, the insistence
of using the speculative refcounting would trigger a VM_BUG_ON if a tail
page was encountered in the page_cache_get_speculative().
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/gup.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c index b9e1c7ff5f6d..d7efdbf640c7 100644 --- a/arch/powerpc/mm/gup.c +++ b/arch/powerpc/mm/gup.c | |||
@@ -16,17 +16,6 @@ | |||
16 | 16 | ||
17 | #ifdef __HAVE_ARCH_PTE_SPECIAL | 17 | #ifdef __HAVE_ARCH_PTE_SPECIAL |
18 | 18 | ||
19 | static inline void get_huge_page_tail(struct page *page) | ||
20 | { | ||
21 | /* | ||
22 | * __split_huge_page_refcount() cannot run | ||
23 | * from under us. | ||
24 | */ | ||
25 | VM_BUG_ON(page_mapcount(page) < 0); | ||
26 | VM_BUG_ON(atomic_read(&page->_count) != 0); | ||
27 | atomic_inc(&page->_mapcount); | ||
28 | } | ||
29 | |||
30 | /* | 19 | /* |
31 | * The performance critical leaf functions are made noinline otherwise gcc | 20 | * The performance critical leaf functions are made noinline otherwise gcc |
32 | * inlines everything into a single function which results in too much | 21 | * inlines everything into a single function which results in too much |
@@ -58,8 +47,6 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, | |||
58 | put_page(page); | 47 | put_page(page); |
59 | return 0; | 48 | return 0; |
60 | } | 49 | } |
61 | if (PageTail(page)) | ||
62 | get_huge_page_tail(page); | ||
63 | pages[*nr] = page; | 50 | pages[*nr] = page; |
64 | (*nr)++; | 51 | (*nr)++; |
65 | 52 | ||