diff options
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a8bf4ab01f86..3be79dc18c5c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -1026,18 +1026,6 @@ static void __init report_hugepages(void) | |||
| 1026 | } | 1026 | } |
| 1027 | } | 1027 | } |
| 1028 | 1028 | ||
| 1029 | static 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 | |||
| 1040 | #ifdef CONFIG_SYSCTL | ||
| 1041 | #ifdef CONFIG_HIGHMEM | 1029 | #ifdef CONFIG_HIGHMEM |
| 1042 | static void try_to_free_low(struct hstate *h, unsigned long count) | 1030 | static void try_to_free_low(struct hstate *h, unsigned long count) |
| 1043 | { | 1031 | { |
| @@ -1386,6 +1374,18 @@ static int __init hugetlb_default_setup(char *s) | |||
| 1386 | } | 1374 | } |
| 1387 | __setup("default_hugepagesz=", hugetlb_default_setup); | 1375 | __setup("default_hugepagesz=", hugetlb_default_setup); |
| 1388 | 1376 | ||
| 1377 | static unsigned int cpuset_mems_nr(unsigned int *array) | ||
| 1378 | { | ||
| 1379 | int node; | ||
| 1380 | unsigned int nr = 0; | ||
| 1381 | |||
| 1382 | for_each_node_mask(node, cpuset_current_mems_allowed) | ||
| 1383 | nr += array[node]; | ||
| 1384 | |||
| 1385 | return nr; | ||
| 1386 | } | ||
| 1387 | |||
| 1388 | #ifdef CONFIG_SYSCTL | ||
| 1389 | int hugetlb_sysctl_handler(struct ctl_table *table, int write, | 1389 | int 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) |
