From d76e7027d394defe42292491e31120b738cb4f05 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 21 Jul 2008 14:21:38 -0700 Subject: [PATCH] --- yaml --- r: 104640 b: refs/heads/master c: d35cb360c29956510b2fe1a953bd4968536f7216 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Makefile | 3 ++- trunk/scripts/Makefile.modpost | 1 + trunk/scripts/mod/modpost.c | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89885758117c..543dd99c8c0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f17156fc55abac476d180e480bedb0f07f01b14 +refs/heads/master: d35cb360c29956510b2fe1a953bd4968536f7216 diff --git a/trunk/Makefile b/trunk/Makefile index 6192922de9c0..4bcd1cf90cb1 100644 --- a/trunk/Makefile +++ b/trunk/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 --git a/trunk/scripts/Makefile.modpost b/trunk/scripts/Makefile.modpost index 17092d6c7db3..9ee9783aea57 100644 --- a/trunk/scripts/Makefile.modpost +++ b/trunk/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 --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c index a07f91aac920..8f038e6d5f98 100644 --- a/trunk/scripts/mod/modpost.c +++ b/trunk/scripts/mod/modpost.c @@ -1992,7 +1992,8 @@ static void read_markers(const char *fname) mod->skip = 1; } - add_marker(mod, marker, fmt); + if (!mod->skip) + add_marker(mod, marker, fmt); } return; fail: