aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/hugetlb.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 41341c414194..a8bf4ab01f86 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1026,6 +1026,17 @@ static void __init report_hugepages(void)
1026 } 1026 }
1027} 1027}
1028 1028
1029static unsigned int cpuset_mems_nr(unsigned int *array)
1030{
1031 int node;
1032 unsigned int nr = 0;
1033
1034 for_each_node_mask(node, cpuset_current_mems_allowed)
1035 nr += array[node];
1036
1037 return nr;
1038}
1039
1029#ifdef CONFIG_SYSCTL 1040#ifdef CONFIG_SYSCTL
1030#ifdef CONFIG_HIGHMEM 1041#ifdef CONFIG_HIGHMEM
1031static void try_to_free_low(struct hstate *h, unsigned long count) 1042static void try_to_free_low(struct hstate *h, unsigned long count)
@@ -1375,17 +1386,6 @@ static int __init hugetlb_default_setup(char *s)
1375} 1386}
1376__setup("default_hugepagesz=", hugetlb_default_setup); 1387__setup("default_hugepagesz=", hugetlb_default_setup);
1377 1388
1378static unsigned int cpuset_mems_nr(unsigned int *array)
1379{
1380 int node;
1381 unsigned int nr = 0;
1382
1383 for_each_node_mask(node, cpuset_current_mems_allowed)
1384 nr += array[node];
1385
1386 return nr;
1387}
1388
1389int hugetlb_sysctl_handler(struct ctl_table *table, int write, 1389int hugetlb_sysctl_handler(struct ctl_table *table, int write,
1390 struct file *file, void __user *buffer, 1390 struct file *file, void __user *buffer,
1391 size_t *length, loff_t *ppos) 1391 size_t *length, loff_t *ppos)