Skip to content

Commit

Permalink
hugetlb: fix CONFIG_SYSCTL=n build
Browse files Browse the repository at this point in the history
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 e44d1b2
    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>
  • Loading branch information
Nishanth Aravamudan authored and Linus Torvalds committed Jul 26, 2008
1 parent 16d6926 commit 8a21346
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1026,18 +1026,6 @@ static void __init report_hugepages(void)
}
}

static unsigned int cpuset_mems_nr(unsigned int *array)
{
int node;
unsigned int nr = 0;

for_each_node_mask(node, cpuset_current_mems_allowed)
nr += array[node];

return nr;
}

#ifdef CONFIG_SYSCTL
#ifdef CONFIG_HIGHMEM
static void try_to_free_low(struct hstate *h, unsigned long count)
{
Expand Down Expand Up @@ -1386,6 +1374,18 @@ static int __init hugetlb_default_setup(char *s)
}
__setup("default_hugepagesz=", hugetlb_default_setup);

static unsigned int cpuset_mems_nr(unsigned int *array)
{
int node;
unsigned int nr = 0;

for_each_node_mask(node, cpuset_current_mems_allowed)
nr += array[node];

return nr;
}

#ifdef CONFIG_SYSCTL
int hugetlb_sysctl_handler(struct ctl_table *table, int write,
struct file *file, void __user *buffer,
size_t *length, loff_t *ppos)
Expand Down

0 comments on commit 8a21346

Please sign in to comment.