[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080717141358.GA22860@Krystal>
Date: Thu, 17 Jul 2008 10:13:58 -0400
From: Mathieu Desnoyers <compudj@...stal.dyndns.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Wenji Huang <wenji.huang@...cle.com>,
Takashi Nishiie <t-nishiie@...css.fujitsu.com>,
ltt-dev@...ts.casi.polymtl.ca, systemtap@...rces.redhat.com,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Fix markers duplicate modpost entry
* Andrew Morton (akpm@...ux-foundation.org) wrote:
> On Thu, 17 Jul 2008 03:03:21 -0400 Mathieu Desnoyers <compudj@...stal.dyndns.org> wrote:
>
> > When a kernel was rebuilt, the previous Module.markers was not cleared. It
> > caused markers with different format strings to appear as duplicates when a
> > markers was changed.
> >
> > I merely merged the patches from Roland and Wenji here. It applies to
> > mainline (and is not intrusive, so will also apply to linux-next).
>
> Is this fix needed in 2.6.26.x? 2.6.25.x?
>
Yes, it's needed in 2.6.26.x and 2.6.25, but I doubt it is critical :
only needed for systemtap users which use markers and rebuild their
kernel after having changed a marker format string.
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
> > From: Roland McGrath <roland@...hat dot com>
> > From: Wenji Huang <wenji.huang@...cle.com>
> > CC: akpm@...ux-foundation.org
>
> whoa, what's all that about?
>
> Patches can only have one Author: in git, and we indicate that in
> emails by putting a From: line right at the top of the changelog.
> (Additional credits can and should be mentioned in the changelog text
> of course). When that From: line is missing we take the authorship
> info from the email headers.
>
> So according to the above, this patch has three authors. Geeze, even I
> can type faster than that!
>
hehehe :)
> Who wrote it?
>
I took the diffs Roland and Wenji sent in separate emails and created
this patch. They are the ones who actually identified the solution. So I
guess I should be the author, with credits to them, if they are ok with
that.
Mathieu
> > ---
> > scripts/Makefile.modpost | 1 +
> > scripts/mod/modpost.c | 3 ++-
> > 2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > Index: linux-2.6-lttng/scripts/Makefile.modpost
> > ===================================================================
> > --- linux-2.6-lttng.orig/scripts/Makefile.modpost 2008-07-17 02:47:44.000000000 -0400
> > +++ linux-2.6-lttng/scripts/Makefile.modpost 2008-07-17 02:48:17.000000000 -0400
> > @@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
> > cmd_kernel-mod = $(modpost) $@
> >
> > vmlinux.o: FORCE
> > + @rm -fr $(kernelmarkersfile)
> > $(call cmd,kernel-mod)
> >
> > # Declare generated files as targets for modpost
> > Index: linux-2.6-lttng/scripts/mod/modpost.c
> > ===================================================================
> > --- linux-2.6-lttng.orig/scripts/mod/modpost.c 2008-07-17 02:49:33.000000000 -0400
> > +++ linux-2.6-lttng/scripts/mod/modpost.c 2008-07-17 02:50:10.000000000 -0400
> > @@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
> > mod->skip = 1;
> > }
> >
> > - add_marker(mod, marker, fmt);
> > + if (!mod->skip)
> > + add_marker(mod, marker, fmt);
> > }
> > return;
> > fail:
>
--
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--
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