The patch titled Revert "hugetlb: Add hugetlb_dynamic_pool sysctl" has been removed from the -mm tree. Its filename was revert-hugetlb-add-hugetlb_dynamic_pool-sysctl.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Revert "hugetlb: Add hugetlb_dynamic_pool sysctl" From: Nishanth Aravamudan <nacc@xxxxxxxxxx> Revert "hugetlb: Add hugetlb_dynamic_pool sysctl" This reverts commit 54f9f80d6543fb7b157d3b11e2e7911dc1379790. 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@xxxxxxxxxx> Acked-by: Adam Litke <agl@xxxxxxxxxx> Cc: William Lee Irwin III <wli@xxxxxxxxxxxxxx> Cc: Dave Hansen <haveblue@xxxxxxxxxx> Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/hugetlb.h | 1 - kernel/sysctl.c | 8 -------- mm/hugetlb.c | 5 ----- 3 files changed, 14 deletions(-) diff -puN include/linux/hugetlb.h~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl include/linux/hugetlb.h --- a/include/linux/hugetlb.h~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl +++ a/include/linux/hugetlb.h @@ -33,7 +33,6 @@ void hugetlb_unreserve_pages(struct inod extern unsigned long max_huge_pages; extern unsigned long hugepages_treat_as_movable; -extern int hugetlb_dynamic_pool; extern unsigned long nr_overcommit_huge_pages; extern const unsigned long hugetlb_zero, hugetlb_infinity; extern int sysctl_hugetlb_shm_group; diff -puN kernel/sysctl.c~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl kernel/sysctl.c --- a/kernel/sysctl.c~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl +++ a/kernel/sysctl.c @@ -906,14 +906,6 @@ static struct ctl_table vm_table[] = { }, { .ctl_name = CTL_UNNUMBERED, - .procname = "hugetlb_dynamic_pool", - .data = &hugetlb_dynamic_pool, - .maxlen = sizeof(hugetlb_dynamic_pool), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, - { - .ctl_name = CTL_UNNUMBERED, .procname = "nr_overcommit_hugepages", .data = &nr_overcommit_huge_pages, .maxlen = sizeof(nr_overcommit_huge_pages), diff -puN mm/hugetlb.c~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl mm/hugetlb.c --- a/mm/hugetlb.c~revert-hugetlb-add-hugetlb_dynamic_pool-sysctl +++ a/mm/hugetlb.c @@ -31,7 +31,6 @@ static unsigned int free_huge_pages_node static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; static gfp_t htlb_alloc_mask = GFP_HIGHUSER; unsigned long hugepages_treat_as_movable; -int hugetlb_dynamic_pool; unsigned long nr_overcommit_huge_pages; static int hugetlb_next_nid; @@ -230,10 +229,6 @@ static struct page *alloc_buddy_huge_pag struct page *page; unsigned int nid; - /* Check if the dynamic pool is enabled */ - if (!hugetlb_dynamic_pool) - return NULL; - /* * Assume we will successfully allocate the surplus page to * prevent racing processes from causing the surplus to exceed _ Patches currently in -mm which might be from nacc@xxxxxxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html