The patch titled
markers: fix duplicate modpost entry
has been removed from the -mm tree. Its filename was
markers-fix-duplicate-modpost-entry.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: markers: fix duplicate modpost entry
From: Mathieu Desnoyers <compudj@xxxxxxxxxxxxxxxxxx>
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. This problem is present since
scripts/mod/modpost.c started to generate Module.markers, commit
b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0
It therefore applies to 2.6.25, 2.6.26 and linux-next.
I merely merged the patches from Roland, Wenji and Takashi here.
Credits to
Roland McGrath <roland@xxxxxxxxxx>
Wenji Huang <wenji.huang@xxxxxxxxxx>
and
Takashi Nishiie <t-nishiie@xxxxxxxxxxxxxxxxxx>
for providing the individual fixes.
- Changelog :
- Integrated Takashi's Makefile modification to clear Module.markers upon
make clean.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Cc: Wenji Huang <wenji.huang@xxxxxxxxxx>
Cc: Takashi Nishiie <t-nishiie@xxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Makefile | 3 ++-
scripts/Makefile.modpost | 1 +
scripts/mod/modpost.c | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff -puN Makefile~markers-fix-duplicate-modpost-entry Makefile
--- a/Makefile~markers-fix-duplicate-modpost-entry
+++ a/Makefile
@@ -1148,7 +1148,8 @@ clean: archclean $(clean-dirs)
@find . $(RCS_FIND_IGNORE) \
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
- -o -name '*.symtypes' -o -name 'modules.order' \) \
+ -o -name '*.symtypes' -o -name 'modules.order' \
+ -o -name 'Module.markers' \) \
-type f -print | xargs rm -f
# mrproper - Delete all generated files, including .config
diff -puN scripts/Makefile.modpost~markers-fix-duplicate-modpost-entry scripts/Makefile.modpost
--- a/scripts/Makefile.modpost~markers-fix-duplicate-modpost-entry
+++ a/scripts/Makefile.modpost
@@ -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
diff -puN scripts/mod/modpost.c~markers-fix-duplicate-modpost-entry scripts/mod/modpost.c
--- a/scripts/mod/modpost.c~markers-fix-duplicate-modpost-entry
+++ a/scripts/mod/modpost.c
@@ -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:
_
Patches currently in -mm which might be from compudj@xxxxxxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
