Re: [GIT PULL] tracing fixes

From: Ingo Molnar
Date: Thu Oct 01 2009 - 15:02:28 EST



* Christoph Hellwig <hch@xxxxxx> wrote:

> On Mon, Sep 21, 2009 at 06:22:11PM +0200, Ingo Molnar wrote:
> > Hm, yes, you are right, we missed that. I noticed the modpost
> > dependency:
> >
> > http://marc.info/?l=linux-kernel&m=125326944223679&w=2
> >
> > but thought that it's safe and didnt notice that dangling
> > module_layout() reference and the build warning it generates in the
> > kernel.
> >
> > I _think_ the patch below should do the trick - module_layout() appears
> > to be an artificial symbol with 'significant' symbols listed in its
> > argument list so that it gets a proper signature. Removing the marker
> > symbol should thus be the solution, but i'm not 100% sure. Thoughts?
> >
> > Ingo
>
> Looks good to me, Linus?
>
> > diff --git a/kernel/module.c b/kernel/module.c
> > index b6ee424..392eb3d 100644
> > --- a/kernel/module.c
> > +++ b/kernel/module.c
> > @@ -2947,7 +2947,6 @@ void module_layout(struct module *mod,
> > struct modversion_info *ver,
> > struct kernel_param *kp,
> > struct kernel_symbol *ks,
> > - struct marker *marker,
> > struct tracepoint *tp)
> > {
> > }
> ---end quoted text---

Yep, already pushed that to Linus some time ago:

115e8a2: modules, tracing: Remove stale struct marker signature from module_layout()

Ingo
--
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/