diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-08-10 14:05:58 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-08-10 14:05:58 -0700 |
| commit | f5931acac40cff4ec59a12db54570d0c2cb3cd91 (patch) | |
| tree | 51e7b7474e349b8f9baf2b3393b27d52169698dd /scripts | |
| parent | a347731f82edeb8f176ae0bcfcc5d7fee6786a7c (diff) | |
| parent | 3ef22854c2ddd56393d99c9c39dc80c7afe1b468 (diff) | |
| download | lwn-f5931acac40cff4ec59a12db54570d0c2cb3cd91.tar.gz lwn-f5931acac40cff4ec59a12db54570d0c2cb3cd91.zip | |
Merge commit 'v2.6.25.14' into olpc-testing
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.modpost | 1 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 2d20640854b7..af21ea99f192 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -87,6 +87,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/scripts/mod/modpost.c b/scripts/mod/modpost.c index 110cf243fa4e..7b16b365ebdf 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1973,7 +1973,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: |