aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2006-03-22 03:08:56 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:54:03 -0500
commit27a85ef1b81300cfff06b4c8037e9914dfb09acc (patch)
tree1a8d9bc4c5611542273e57fc2606c12905906a57 /mm
parentb45b5bd65f668a665db40d093e4e1fe563533608 (diff)
[PATCH] hugepage: Make {alloc,free}_huge_page() local
Originally, mm/hugetlb.c just handled the hugepage physical allocation path and its {alloc,free}_huge_page() functions were used from the arch specific hugepage code. These days those functions are only used with mm/hugetlb.c itself. Therefore, this patch makes them static and removes their prototypes from hugetlb.h. This requires a small rearrangement of code in mm/hugetlb.c to avoid a forward declaration. This patch causes no regressions on the libhugetlbfs testsuite (ppc64, POWER5). Signed-off-by: David Gibson <dwg@au1.ibm.com> Cc: William Lee Irwin III <wli@holomorphy.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/hugetlb.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 27fad5d9bcf6..075877b1cbc0 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -88,6 +88,17 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
88 return page; 88 return page;
89} 89}
90 90
91static void free_huge_page(struct page *page)
92{
93 BUG_ON(page_count(page));
94
95 INIT_LIST_HEAD(&page->lru);
96
97 spin_lock(&hugetlb_lock);
98 enqueue_huge_page(page);
99 spin_unlock(&hugetlb_lock);
100}
101
91static int alloc_fresh_huge_page(void) 102static int alloc_fresh_huge_page(void)
92{ 103{
93 static int nid = 0; 104 static int nid = 0;
@@ -107,18 +118,8 @@ static int alloc_fresh_huge_page(void)
107 return 0; 118 return 0;
108} 119}
109 120
110void free_huge_page(struct page *page) 121static struct page *alloc_huge_page(struct vm_area_struct *vma,
111{ 122 unsigned long addr)
112 BUG_ON(page_count(page));
113
114 INIT_LIST_HEAD(&page->lru);
115
116 spin_lock(&hugetlb_lock);
117 enqueue_huge_page(page);
118 spin_unlock(&hugetlb_lock);
119}
120
121struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr)
122{ 123{
123 struct inode *inode = vma->vm_file->f_dentry->d_inode; 124 struct inode *inode = vma->vm_file->f_dentry->d_inode;
124 struct page *page; 125 struct page *page;