From 48387d8fcb9690238ec21440de1293dad1057250 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 22 Nov 2007 03:43:09 +0100 Subject: [PATCH] --- yaml --- r: 77943 b: refs/heads/master c: 58b7a68de37face98afe7c705391145795a982b5 h: refs/heads/master i: 77941: 66bc4251d7cf1c326c323b8748a0480e59b90113 77939: 2497ff6d6b9c437a54ea19e4c8555ae55d229ae9 77935: 628c7cb39216f83632aac32fbf59a91a0ce17813 v: v3 --- [refs] | 2 +- trunk/scripts/mod/modpost.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 80fd8178f73c..f4bc9c931b0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d9a89ea4b06146d29e1ffb4d6fded286fa07d29 +refs/heads/master: 58b7a68de37face98afe7c705391145795a982b5 diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c index 3a12c22cc2f8..404ee0d0aac6 100644 --- a/trunk/scripts/mod/modpost.c +++ b/trunk/scripts/mod/modpost.c @@ -388,7 +388,7 @@ static int parse_elf(struct elf_info *info, const char *filename) /* Check if file offset is correct */ if (hdr->e_shoff > info->size) { - fatal("section header offset=%u in file '%s' is bigger then filesize=%lu\n", hdr->e_shoff, filename, info->size); + fatal("section header offset=%lu in file '%s' is bigger then filesize=%lu\n", (unsigned long)hdr->e_shoff, filename, info->size); return 0; } @@ -409,7 +409,7 @@ static int parse_elf(struct elf_info *info, const char *filename) const char *secname; if (sechdrs[i].sh_offset > info->size) { - fatal("%s is truncated. sechdrs[i].sh_offset=%u > sizeof(*hrd)=%ul\n", filename, (unsigned int)sechdrs[i].sh_offset, sizeof(*hdr)); + fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%lu\n", filename, (unsigned long)sechdrs[i].sh_offset, sizeof(*hdr)); return 0; } secname = secstrings + sechdrs[i].sh_name; @@ -907,7 +907,8 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec, "before '%s' (at offset -0x%llx)\n", modname, fromsec, (unsigned long long)r.r_offset, secname, refsymname, - elf->strtab + after->st_name); + elf->strtab + after->st_name, + (unsigned long long)r.r_offset); } else { warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s\n", modname, fromsec, (unsigned long long)r.r_offset,