[PATCH] hugetlb: fix CONFIG_SYSCTL=n build

[Nishanth Aravamudan]

On 25.07.2008 [18:09:35 +0100], Alan Cox wrote:
> On Thu, 24 Jul 2008 07:26:03 +0200
> Ingo Molnar <mingo@xxxxxxx> wrote:
> 
> > 
> > not sure it's known but despite all the fixes i still get:
> > 
> >  drivers/built-in.o: In function `ne_drv_resume':
> >  ne.c:(.text+0x146ba4): undefined reference to `NS8390_init'
> >  drivers/built-in.o: In function `ne_block_output':
> >  ne.c:(.text+0x146e00): undefined reference to `NS8390_init'
> 
> This should do the trick. I can't test it currently as that configuration
> now fails to build with mm errors in current git head..
> 
> mm/hugetlb.c: In function ???hugetlb_acct_memory???: mm/hugetlb.c:1507:
> error: implicit declaration of function ???cpuset_mems_nr???

When moving the intialization functions around, I did not remove the
dependency of some helpers on CONFIG_SYSCTL. This led to a large chunk
of code being elided even though it is needed to build hugetlb.o.

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â??

Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 41341c4..3be79dc 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1026,7 +1026,6 @@ static void __init report_hugepages(void)
 	}
 }
 
-#ifdef CONFIG_SYSCTL
 #ifdef CONFIG_HIGHMEM
 static void try_to_free_low(struct hstate *h, unsigned long count)
 {
@@ -1386,6 +1385,7 @@ static unsigned int cpuset_mems_nr(unsigned int *array)
 	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)

-- 
Nishanth Aravamudan <nacc@xxxxxxxxxx>
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/