From 07eec9cd2a77c97a3e0ade0438af210a7490daed Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Wed, 2 Nov 2011 13:37:03 -0700
Subject: [PATCH] --- yaml --- r: 273220 b: refs/heads/master c:
 2839bdc1bfc0af76a2f0f11eca011590520a04fa h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/powerpc/mm/gup.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index eeeea0499cc3..1c047eba2a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70b50f94f1644e2aa7cb374819cfd93f3c28d725
+refs/heads/master: 2839bdc1bfc0af76a2f0f11eca011590520a04fa
diff --git a/trunk/arch/powerpc/mm/gup.c b/trunk/arch/powerpc/mm/gup.c
index b9e1c7ff5f6d..d7efdbf640c7 100644
--- a/trunk/arch/powerpc/mm/gup.c
+++ b/trunk/arch/powerpc/mm/gup.c
@@ -16,17 +16,6 @@
 
 #ifdef __HAVE_ARCH_PTE_SPECIAL
 
-static inline void get_huge_page_tail(struct page *page)
-{
-	/*
-	 * __split_huge_page_refcount() cannot run
-	 * from under us.
-	 */
-	VM_BUG_ON(page_mapcount(page) < 0);
-	VM_BUG_ON(atomic_read(&page->_count) != 0);
-	atomic_inc(&page->_mapcount);
-}
-
 /*
  * The performance critical leaf functions are made noinline otherwise gcc
  * 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,
 			put_page(page);
 			return 0;
 		}
-		if (PageTail(page))
-			get_huge_page_tail(page);
 		pages[*nr] = page;
 		(*nr)++;