diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 23:48:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 23:48:16 -0700 |
| commit | a8c1914f6231dc62a4b1525e3a394b49e3675ebe (patch) | |
| tree | 9071ac3f8509b2e62835c35c5ce431ae912e1a6f /scripts/mod | |
| parent | c3adda8107af12219941bc5de635ab121c72afd0 (diff) | |
| parent | a2c665b04fb8acd2de0216cf38215ef11904fbcd (diff) | |
Merge bk://linux-sam.bkbits.net/kbuild
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/Makefile | 4 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 7 | ||||
| -rw-r--r-- | scripts/mod/sumversion.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index f66bf5262aae..11d69c35e5b4 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -1,5 +1,5 @@ -host-progs := modpost mk_elfconfig -always := $(host-progs) empty.o +hostprogs-y := modpost mk_elfconfig +always := $(hostprogs-y) empty.o modpost-objs := modpost.o file2alias.o sumversion.o diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 662e75b2f780..65072d76a101 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -343,7 +343,6 @@ handle_modversions(struct module *mod, struct elf_info *info, crc = (unsigned int) sym->st_value; add_exported_symbol(symname + strlen(CRC_PFX), mod, &crc); - modversions = 1; } break; case SHN_UNDEF: @@ -649,7 +648,6 @@ read_dump(const char *fname) if (!(mod = find_module(modname))) { if (is_vmlinux(modname)) { - modversions = 1; have_vmlinux = 1; } mod = new_module(NOFAIL(strdup(modname))); @@ -696,11 +694,14 @@ main(int argc, char **argv) char *dump_read = NULL, *dump_write = NULL; int opt; - while ((opt = getopt(argc, argv, "i:o:")) != -1) { + while ((opt = getopt(argc, argv, "i:mo:")) != -1) { switch(opt) { case 'i': dump_read = optarg; break; + case 'm': + modversions = 1; + break; case 'o': dump_write = optarg; break; diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index b41b718edffe..631430d09e4d 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -1,4 +1,4 @@ -#include <netinet/in.h> +#include <arpa/inet.h> #include <stdint.h> #include <ctype.h> #include <errno.h> |