diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2007-12-17 19:20:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 22:28:17 -0500 |
commit | 368d2c6358c3c62b3820a8a73f9fe9c8b540cdea (patch) | |
tree | 43c9c0958897de5ecedf26c3ba8433dd252d24f7 /kernel | |
parent | d1c3fb1f8f29c41b0d098d7cfb3c32939043631f (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 'kernel')
-rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b85a1282605d..1135de730872 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -906,14 +906,6 @@ static struct ctl_table vm_table[] = { | |||
906 | }, | 906 | }, |
907 | { | 907 | { |
908 | .ctl_name = CTL_UNNUMBERED, | 908 | .ctl_name = CTL_UNNUMBERED, |
909 | .procname = "hugetlb_dynamic_pool", | ||
910 | .data = &hugetlb_dynamic_pool, | ||
911 | .maxlen = sizeof(hugetlb_dynamic_pool), | ||
912 | .mode = 0644, | ||
913 | .proc_handler = &proc_dointvec, | ||
914 | }, | ||
915 | { | ||
916 | .ctl_name = CTL_UNNUMBERED, | ||
917 | .procname = "nr_overcommit_hugepages", | 909 | .procname = "nr_overcommit_hugepages", |
918 | .data = &nr_overcommit_huge_pages, | 910 | .data = &nr_overcommit_huge_pages, |
919 | .maxlen = sizeof(nr_overcommit_huge_pages), | 911 | .maxlen = sizeof(nr_overcommit_huge_pages), |