Re: [PATCH] Fix markers duplicate modpost entry

[Andrew Morton]

On Thu, 17 Jul 2008 03:03:21 -0400 Mathieu Desnoyers <compudj@xxxxxxxxxxxxxxxxxx> 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?

> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
> From: Roland McGrath <roland@redhat dot com>
> From: Wenji Huang <wenji.huang@xxxxxxxxxx>
> CC: akpm@xxxxxxxxxxxxxxxxxxxx

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!

Who wrote it?

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

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