[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090828092426.GC4849@cr0.nay.redhat.com>
Date: Fri, 28 Aug 2009 17:24:26 +0800
From: Amerigo Wang <xiyou.wangcong@...il.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
James Bottomley <James.Bottomley@...senPartnership.com>,
Rusty Russell <rusty@...tcorp.com.au>,
Helge Deller <deller@....de>
Subject: Re: modules: Fix build error in the !CONFIG_KALLSYMS case
On Fri, Aug 28, 2009 at 10:44:56AM +0200, Ingo Molnar wrote:
>
>* Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
>> James Bottomley (1):
>> module: workaround duplicate section names
>
>-tip testing found that this patch breaks the build on x86 if
>CONFIG_KALLSYMS is disabled:
>
> kernel/module.c: In function ‘load_module’:
> kernel/module.c:2367: error: ‘struct module’ has no member named ‘sect_attrs’
> distcc[8269] ERROR: compile kernel/module.c on ph/32 failed
> make[1]: *** [kernel/module.o] Error 1
> make: *** [kernel] Error 2
> make: *** Waiting for unfinished jobs....
>
Ouch..
>Commit 1b364bf misses the fact that section attributes are only
>built and dealt with if kallsyms is enabled. The patch below fixes
>this.
>
>( note, technically speaking this should depend on CONFIG_SYSFS as
> well but this patch is correct too and keeps the #ifdef less
> intrusive - in the KALLSYMS && !SYSFS case the code is a NOP. )
>
>Signed-off-by: Ingo Molnar <mingo@...e.hu>
I reviewed that patch. This one looks fine.
Reviewed-by: WANG Cong <xiyou.wangcong@...il.com>
Thanks!
>---
> kernel/module.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>diff --git a/kernel/module.c b/kernel/module.c
>index eccb561..b4016d1 100644
>--- a/kernel/module.c
>+++ b/kernel/module.c
>@@ -2355,8 +2355,10 @@ static noinline struct module *load_module(void __user *umod,
> if (err < 0)
> goto unlink;
> add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
>+#ifdef CONFIG_KALLSYMS
> if (mod->sect_attrs)
> add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
>+#endif
>
> /* Get rid of temporary copy */
> vfree(hdr);
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@...r.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists