diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2008-02-08 07:18:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:23 -0500 |
commit | a3d0c6aa1bb342b9b2c7b123b52ac2f48a4d4d0a (patch) | |
tree | 0c6766dd2add1f08c6153769c655e46ddff82a42 /kernel/sysctl.c | |
parent | ac74c00e499ed276a965e5b5600667d5dc04a84a (diff) |
hugetlb: add locking for overcommit sysctl
When I replaced hugetlb_dynamic_pool with nr_overcommit_hugepages I used
proc_doulongvec_minmax() directly. However, hugetlb.c's locking rules
require that all counter modifications occur under the hugetlb_lock. Add a
callback into the hugetlb code similar to the one for nr_hugepages. Grab
the lock around the manipulation of nr_overcommit_hugepages in
proc_doulongvec_minmax().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Adam Litke <agl@us.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8c98d8147d88..9dadc9d88a03 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -982,7 +982,7 @@ static struct ctl_table vm_table[] = { | |||
982 | .data = &nr_overcommit_huge_pages, | 982 | .data = &nr_overcommit_huge_pages, |
983 | .maxlen = sizeof(nr_overcommit_huge_pages), | 983 | .maxlen = sizeof(nr_overcommit_huge_pages), |
984 | .mode = 0644, | 984 | .mode = 0644, |
985 | .proc_handler = &proc_doulongvec_minmax, | 985 | .proc_handler = &hugetlb_overcommit_handler, |
986 | }, | 986 | }, |
987 | #endif | 987 | #endif |
988 | { | 988 | { |