From 505e2321a85c2e5127c38d64c54516d49dffe13d Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Fri, 8 Feb 2008 04:18:18 -0800 Subject: [PATCH] --- yaml --- r: 84601 b: refs/heads/master c: a3d0c6aa1bb342b9b2c7b123b52ac2f48a4d4d0a h: refs/heads/master i: 84599: 4b21bf8632751650c8d63eed6b5fcb1a6ca488f3 v: v3 --- [refs] | 2 +- trunk/include/linux/hugetlb.h | 1 + trunk/kernel/sysctl.c | 2 +- trunk/mm/hugetlb.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6e9b5c0dcd4d..dde8fa096529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac74c00e499ed276a965e5b5600667d5dc04a84a +refs/heads/master: a3d0c6aa1bb342b9b2c7b123b52ac2f48a4d4d0a diff --git a/trunk/include/linux/hugetlb.h b/trunk/include/linux/hugetlb.h index 30d606afcafe..7ca198b379af 100644 --- a/trunk/include/linux/hugetlb.h +++ b/trunk/include/linux/hugetlb.h @@ -17,6 +17,7 @@ static inline int is_vm_hugetlb_page(struct vm_area_struct *vma) } int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); +int hugetlb_overcommit_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); int hugetlb_treat_movable_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *); int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, struct page **, struct vm_area_struct **, unsigned long *, int *, int, int); diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 8c98d8147d88..9dadc9d88a03 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -982,7 +982,7 @@ static struct ctl_table vm_table[] = { .data = &nr_overcommit_huge_pages, .maxlen = sizeof(nr_overcommit_huge_pages), .mode = 0644, - .proc_handler = &proc_doulongvec_minmax, + .proc_handler = &hugetlb_overcommit_handler, }, #endif { diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 1a5642074e34..d9a380312467 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -605,6 +605,16 @@ int hugetlb_treat_movable_handler(struct ctl_table *table, int write, return 0; } +int hugetlb_overcommit_handler(struct ctl_table *table, int write, + struct file *file, void __user *buffer, + size_t *length, loff_t *ppos) +{ + spin_lock(&hugetlb_lock); + proc_doulongvec_minmax(table, write, file, buffer, length, ppos); + spin_unlock(&hugetlb_lock); + return 0; +} + #endif /* CONFIG_SYSCTL */ int hugetlb_report_meminfo(char *buf)