This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[PATCH] Fix markers duplicate modpost entry
- From: Mathieu Desnoyers <compudj at krystal dot dyndns dot org>
- To: akpm at linux-foundation dot org, Wenji Huang <wenji dot huang at oracle dot com>
- Cc: Takashi Nishiie <t-nishiie at np dot css dot fujitsu dot com>, ltt-dev at lists dot casi dot polymtl dot ca, systemtap at sources dot redhat dot com, linux-kernel at vger dot kernel dot org
- Date: Thu, 17 Jul 2008 03:03:21 -0400
- Subject: [PATCH] Fix markers duplicate modpost entry
- References: <20080715024754.GA26471@Krystal> <000001c8e7aa$b9548600$2bfd9200$@css.fujitsu.com> <20080717024550.GA22869@Krystal> <487ED503.2060503@oracle.com>
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).
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
From: Roland McGrath <roland@redhat dot com>
From: Wenji Huang <wenji.huang@oracle.com>
CC: akpm@linux-foundation.org
---
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