]> err.no Git - linux-2.6/commitdiff
kbuild: fix format string warnings in modpost
authorAndi Kleen <ak@suse.de>
Thu, 22 Nov 2007 02:43:09 +0000 (03:43 +0100)
committerSam Ravnborg <sam@ravnborg.org>
Mon, 28 Jan 2008 22:14:36 +0000 (23:14 +0100)
Fix wrong format strings in modpost exposed by the previous patch.
Including one missing argument -- some random data was printed instead.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
scripts/mod/modpost.c

index 3a12c22cc2f8f0ca82f624a50c4878fce389e7bb..404ee0d0aac63de3dc73d5e51a3984810f9998e5 100644 (file)
@@ -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,