diff options
-rw-r--r-- | include/linux/hugetlb.h | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 8 | ||||
-rw-r--r-- | mm/hugetlb.c | 5 |
3 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index f7bc869a29b8..30d606afcafe 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
@@ -33,7 +33,6 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed); | |||
33 | 33 | ||
34 | extern unsigned long max_huge_pages; | 34 | extern unsigned long max_huge_pages; |
35 | extern unsigned long hugepages_treat_as_movable; | 35 | extern unsigned long hugepages_treat_as_movable; |
36 | extern int hugetlb_dynamic_pool; | ||
37 | extern unsigned long nr_overcommit_huge_pages; | 36 | extern unsigned long nr_overcommit_huge_pages; |
38 | extern const unsigned long hugetlb_zero, hugetlb_infinity; | 37 | extern const unsigned long hugetlb_zero, hugetlb_infinity; |
39 | extern int sysctl_hugetlb_shm_group; | 38 | extern int sysctl_hugetlb_shm_group; |
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), |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3a790651475a..7224a4f07106 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -31,7 +31,6 @@ static unsigned int free_huge_pages_node[MAX_NUMNODES]; | |||
31 | static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; | 31 | static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; |
32 | static gfp_t htlb_alloc_mask = GFP_HIGHUSER; | 32 | static gfp_t htlb_alloc_mask = GFP_HIGHUSER; |
33 | unsigned long hugepages_treat_as_movable; | 33 | unsigned long hugepages_treat_as_movable; |
34 | int hugetlb_dynamic_pool; | ||
35 | unsigned long nr_overcommit_huge_pages; | 34 | unsigned long nr_overcommit_huge_pages; |
36 | static int hugetlb_next_nid; | 35 | static 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 |