diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2008-07-25 22:44:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:01 -0400 |
commit | 8a21346058ad946134b6ddfeb5de975c3cfcf5da (patch) | |
tree | cd9210fc5a56a5d3090941d62f1bc0217499940f /mm/hugetlb.c | |
parent | 16d69265b930f7e2fa9eea381715696f780718f4 (diff) |
hugetlb: fix CONFIG_SYSCTL=n build
Fixes a build failure reported by Alan Cox:
mm/hugetlb.c: In function `hugetlb_acct_memory': mm/hugetlb.c:1507:
error: implicit declaration of function `cpuset_mems_nr'
Also reverts Ingo's
commit e44d1b2998d62a1f2f4d7eb17b56ba396535509f
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 25 12:57:41 2008 +0200
mm/hugetlb.c: fix build failure with !CONFIG_SYSCTL
which fixed the build error but added some unused-static-function warnings.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 a8bf4ab01f8..3be79dc18c5 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) |