aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2011-11-02 16:37:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 19:06:58 -0400
commitb35a35b556f5e6b7993ad0baf20173e75c09ce8c (patch)
tree85ea46dde6e97d4c73b724698fd65a403529953e /arch
parente0d85a366c2300efd230ef82a9b22110b0658331 (diff)
thp: share get_huge_page_tail()
This avoids duplicating the function in every arch gup_fast. 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> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/mm/hugetlbpage.c11
-rw-r--r--arch/s390/mm/gup.c11
-rw-r--r--arch/sparc/mm/gup.c11
-rw-r--r--arch/x86/mm/gup.c11
4 files changed, 0 insertions, 44 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 1c59d94f594..da5eb388570 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -385,17 +385,6 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address,
385 return NULL; 385 return NULL;
386} 386}
387 387
388static inline void get_huge_page_tail(struct page *page)
389{
390 /*
391 * __split_huge_page_refcount() cannot run
392 * from under us.
393 */
394 VM_BUG_ON(page_mapcount(page) < 0);
395 VM_BUG_ON(atomic_read(&page->_count) != 0);
396 atomic_inc(&page->_mapcount);
397}
398
399static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, 388static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,
400 unsigned long end, int write, struct page **pages, int *nr) 389 unsigned long end, int write, struct page **pages, int *nr)
401{ 390{
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c
index da33a0281d9..65cb06e2af4 100644
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
@@ -48,17 +48,6 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
48 return 1; 48 return 1;
49} 49}
50 50
51static inline void get_huge_page_tail(struct page *page)
52{
53 /*
54 * __split_huge_page_refcount() cannot run
55 * from under us.
56 */
57 VM_BUG_ON(page_mapcount(page) < 0);
58 VM_BUG_ON(atomic_read(&page->_count) != 0);
59 atomic_inc(&page->_mapcount);
60}
61
62static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, 51static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
63 unsigned long end, int write, struct page **pages, int *nr) 52 unsigned long end, int write, struct page **pages, int *nr)
64{ 53{
diff --git a/arch/sparc/mm/gup.c b/arch/sparc/mm/gup.c
index afcebac144f..42c55df3aec 100644
--- a/arch/sparc/mm/gup.c
+++ b/arch/sparc/mm/gup.c
@@ -12,17 +12,6 @@
12#include <linux/rwsem.h> 12#include <linux/rwsem.h>
13#include <asm/pgtable.h> 13#include <asm/pgtable.h>
14 14
15static inline void get_huge_page_tail(struct page *page)
16{
17 /*
18 * __split_huge_page_refcount() cannot run
19 * from under us.
20 */
21 VM_BUG_ON(page_mapcount(page) < 0);
22 VM_BUG_ON(atomic_read(&page->_count) != 0);
23 atomic_inc(&page->_mapcount);
24}
25
26/* 15/*
27 * The performance critical leaf functions are made noinline otherwise gcc 16 * The performance critical leaf functions are made noinline otherwise gcc
28 * inlines everything into a single function which results in too much 17 * inlines everything into a single function which results in too much
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
index 3b5032a62b0..ea305856151 100644
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
@@ -108,17 +108,6 @@ static inline void get_head_page_multiple(struct page *page, int nr)
108 SetPageReferenced(page); 108 SetPageReferenced(page);
109} 109}
110 110
111static inline void get_huge_page_tail(struct page *page)
112{
113 /*
114 * __split_huge_page_refcount() cannot run
115 * from under us.
116 */
117 VM_BUG_ON(page_mapcount(page) < 0);
118 VM_BUG_ON(atomic_read(&page->_count) != 0);
119 atomic_inc(&page->_mapcount);
120}
121
122static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr, 111static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr,
123 unsigned long end, int write, struct page **pages, int *nr) 112 unsigned long end, int write, struct page **pages, int *nr)
124{ 113{