lkml.org 
[lkml]   [2008]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH RESEND] hugetlb: fix CONFIG_SYSCTL=n build
On Fri, 25 Jul 2008 13:33:51 -0700
Nishanth Aravamudan <nacc@us.ibm.com> wrote:

> [resending with Linus' address fixed]
>
> On 25.07.2008 [18:09:35 +0100], Alan Cox wrote:
> > On Thu, 24 Jul 2008 07:26:03 +0200
> > Ingo Molnar <mingo@elte.hu> 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???

Remind me to give a wedgie to the next gcc developer I meet.

>
> 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______

And the next one.

LANG=C stomps this silliness.

> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
>
> 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)
>

OK, we had a fix from Ingo but this one is better.


\
 
 \ /
  Last update: 2008-07-25 23:39    [W:0.371 / U:0.072 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site