Commit 368d2c63 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

Revert "hugetlb: Add hugetlb_dynamic_pool sysctl" 



This reverts commit 54f9f80d ("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: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Acked-by: default avatarAdam 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d1c3fb1f

include/linux/hugetlb.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed); 


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;

kernel/sysctl.c

+0 −8
Original line number Diff line number Diff line
@@ -904,14 +904,6 @@ static struct ctl_table vm_table[] = { 
		.mode		= 0644,

		.proc_handler	= &hugetlb_treat_movable_handler,

	},

	{

		.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",

mm/hugetlb.c

+0 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ static unsigned int free_huge_pages_node[MAX_NUMNODES]; 
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_page(struct vm_area_struct *vma, 
	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

CRA Git | Maintained and supported by SUSTech CRA and CCSE