diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 15:20:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 15:20:01 -0400 |
| commit | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (patch) | |
| tree | 792449152961db67e4a2855af4518db55822ff64 /scripts/mod | |
| parent | eebb2afb82c4f999e850d198af26ce6969d0f47a (diff) | |
| parent | 2810ae8c73cbfb37891aa99dfbca46ffd40dbc91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
docbook: make cleandocs
kbuild: fix spurious initramfs rebuild
Documentation: explain the difference between __bitwise and __bitwise__
kbuild: make it possible for the linker to discard local symbols from vmlinux
kbuild: remove pointless strdup() on arguments passed to new_module() in modpost
kbuild: fix a few typos in top-level Makefile
kbuild: introduce destination-y for exported headers
kbuild: use git svn instead of git-svn in setlocalversion
kconfig: fix update-po-config to accect backslash in input
kbuild: fix option processing for -I in headerdep
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 8cc70612984c..df6e6286a065 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -1913,7 +1913,7 @@ static void read_dump(const char *fname, unsigned int kernel) | |||
| 1913 | if (!mod) { | 1913 | if (!mod) { |
| 1914 | if (is_vmlinux(modname)) | 1914 | if (is_vmlinux(modname)) |
| 1915 | have_vmlinux = 1; | 1915 | have_vmlinux = 1; |
| 1916 | mod = new_module(NOFAIL(strdup(modname))); | 1916 | mod = new_module(modname); |
| 1917 | mod->skip = 1; | 1917 | mod->skip = 1; |
| 1918 | } | 1918 | } |
| 1919 | s = sym_add_exported(symname, mod, export_no(export)); | 1919 | s = sym_add_exported(symname, mod, export_no(export)); |
| @@ -1997,7 +1997,7 @@ static void read_markers(const char *fname) | |||
| 1997 | 1997 | ||
| 1998 | mod = find_module(modname); | 1998 | mod = find_module(modname); |
| 1999 | if (!mod) { | 1999 | if (!mod) { |
| 2000 | mod = new_module(NOFAIL(strdup(modname))); | 2000 | mod = new_module(modname); |
| 2001 | mod->skip = 1; | 2001 | mod->skip = 1; |
| 2002 | } | 2002 | } |
| 2003 | if (is_vmlinux(modname)) { | 2003 | if (is_vmlinux(modname)) { |