diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 06:57:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 14:35:41 -0400 |
commit | e44d1b2998d62a1f2f4d7eb17b56ba396535509f (patch) | |
tree | febb4d6e113c34e0f83375712f078da41a0a59af | |
parent | 5047887caf1806f31652210df27fb62a7c43f27d (diff) |
mm/hugetlb.c: fix build failure with !CONFIG_SYSCTL
on !CONFIG_SYSCTL on x86 with latest -git i get:
mm/hugetlb.c: In function 'decrement_hugepage_resv_vma':
mm/hugetlb.c:83: error: 'reserve' undeclared (first use in this function)
mm/hugetlb.c:83: error: (Each undeclared identifier is reported only once
mm/hugetlb.c:83: error: for each function it appears in.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/hugetlb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 41341c41419..a8bf4ab01f8 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 | ||
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 | |||
1029 | #ifdef CONFIG_SYSCTL | 1040 | #ifdef CONFIG_SYSCTL |
1030 | #ifdef CONFIG_HIGHMEM | 1041 | #ifdef CONFIG_HIGHMEM |
1031 | static void try_to_free_low(struct hstate *h, unsigned long count) | 1042 | static 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 | ||
1378 | static 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 | |||
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) |