Messages in this thread Patch in this message | | | Date | Thu, 17 Jul 2008 03:03:21 -0400 | From | Mathieu Desnoyers <> | Subject | [PATCH] Fix markers duplicate modpost entry |
| |
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
| |