hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "hugetlb: Add hugetlb_dynamic_pool sysctl" 

This reverts commit 54f9f80d65 ("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>
This commit is contained in:
Nishanth Aravamudan 2007-12-17 16:20:22 -08:00 committed by Linus Torvalds
parent d1c3fb1f8f
commit 368d2c6358
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/hugetlb.h
View File

@ -33,7 +33,6 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);
extern unsigned long max_huge_pages; extern unsigned long max_huge_pages;
extern unsigned long hugepages_treat_as_movable; extern unsigned long hugepages_treat_as_movable;
extern int hugetlb_dynamic_pool;
extern unsigned long nr_overcommit_huge_pages; extern unsigned long nr_overcommit_huge_pages;
extern const unsigned long hugetlb_zero, hugetlb_infinity; extern const unsigned long hugetlb_zero, hugetlb_infinity;
extern int sysctl_hugetlb_shm_group; extern int sysctl_hugetlb_shm_group;

8
kernel/sysctl.c
View File

@ -904,14 +904,6 @@ static struct ctl_table vm_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &hugetlb_treat_movable_handler, .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, .ctl_name = CTL_UNNUMBERED,
.procname = "nr_overcommit_hugepages", .procname = "nr_overcommit_hugepages",

5
mm/hugetlb.c
View File

@ -31,7 +31,6 @@ static unsigned int free_huge_pages_node[MAX_NUMNODES];
static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; static unsigned int surplus_huge_pages_node[MAX_NUMNODES];
static gfp_t htlb_alloc_mask = GFP_HIGHUSER; static gfp_t htlb_alloc_mask = GFP_HIGHUSER;
unsigned long hugepages_treat_as_movable; unsigned long hugepages_treat_as_movable;
int hugetlb_dynamic_pool;
unsigned long nr_overcommit_huge_pages; unsigned long nr_overcommit_huge_pages;
static int hugetlb_next_nid; static int hugetlb_next_nid;
@ -230,10 +229,6 @@ static struct page *alloc_buddy_huge_page(struct vm_area_struct *vma,
struct page *page; struct page *page;
unsigned int nid; 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 * Assume we will successfully allocate the surplus page to
* prevent racing processes from causing the surplus to exceed * prevent racing processes from causing the surplus to exceed