Commit 8a21346058ad946134b6ddfeb5de975c3cfcf5da
Committed by
Linus Torvalds
Linus Torvalds
1 parent
16d69265b9
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 12 additions and 12 deletions Side-by-side Diff
mm/hugetlb.c
| ... | ... | @@ -1026,18 +1026,6 @@ |
| 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 | 1029 | #ifdef CONFIG_HIGHMEM |
| 1042 | 1030 | static void try_to_free_low(struct hstate *h, unsigned long count) |
| 1043 | 1031 | { |
| ... | ... | @@ -1386,6 +1374,18 @@ |
| 1386 | 1374 | } |
| 1387 | 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 | 1389 | int hugetlb_sysctl_handler(struct ctl_table *table, int write, |
| 1390 | 1390 | struct file *file, void __user *buffer, |
| 1391 | 1391 | size_t *length, loff_t *ppos) |