aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2007-12-17 19:20:22 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 22:28:17 -0500
commit368d2c6358c3c62b3820a8a73f9fe9c8b540cdea (patch)
tree43c9c0958897de5ecedf26c3ba8433dd252d24f7 /mm
parentd1c3fb1f8f29c41b0d098d7cfb3c32939043631f (diff)
Revert "hugetlb: Add hugetlb_dynamic_pool sysctl"
This reverts commit 54f9f80d6543fb7b157d3b11e2e7911dc1379790 ("hugetlb: Add hugetlb_dynamic_pool sysctl") Given the new sysctl nr_overcommit_hugepages, the boolean dynamic pool sysctl is not needed, as its semantics can be expressed by 0 in the overcommit sysctl (no dynamic pool) and non-0 in the overcommit sysctl (pool enabled). (Needed in 2.6.24 since it reverts a post-2.6.23 userspace-visible change) Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Acked-by: Adam Litke <agl@us.ibm.com> Cc: William Lee Irwin III <wli@holomorphy.com> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: 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 'mm')
-rw-r--r--mm/hugetlb.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3a790651475..7224a4f0710 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -31,7 +31,6 @@ static unsigned int free_huge_pages_node[MAX_NUMNODES];
31static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; 31static unsigned int surplus_huge_pages_node[MAX_NUMNODES];
32static gfp_t htlb_alloc_mask = GFP_HIGHUSER; 32static gfp_t htlb_alloc_mask = GFP_HIGHUSER;
33unsigned long hugepages_treat_as_movable; 33unsigned long hugepages_treat_as_movable;
34int hugetlb_dynamic_pool;
35unsigned long nr_overcommit_huge_pages; 34unsigned long nr_overcommit_huge_pages;
36static int hugetlb_next_nid; 35static int hugetlb_next_nid;
37 36
@@ -230,10 +229,6 @@ static struct page *alloc_buddy_huge_page(struct vm_area_struct *vma,
230 struct page *page; 229 struct page *page;
231 unsigned int nid; 230 unsigned int nid;
232 231
233 /* Check if the dynamic pool is enabled */
234 if (!hugetlb_dynamic_pool)
235 return NULL;
236
237 /* 232 /*
238 * Assume we will successfully allocate the surplus page to 233 * Assume we will successfully allocate the surplus page to
239 * prevent racing processes from causing the surplus to exceed 234 * prevent racing processes from causing the surplus to exceed