korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

modpost: Join broken long printed messages

Browse Source 
Breaking long printed messages in multiple lines makes it very hard to
look up where they originated from.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Geert Uytterhoeven 2022-11-09 14:30:55 +01:00 committed by Masahiro Yamada
parent eb7081409f
commit 0d2573a2b7
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/mod/file2alias.c
View File

@ -140,25 +140,22 @@ static void device_id_check(const char *modname, const char *device_id,
int i; int i;
if (size % id_size || size < id_size) { if (size % id_size || size < id_size) {
fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo " fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo of the size of section __mod_%s__<identifier>_device_table=%lu.\n"
"of the size of " "Fix definition of struct %s_device_id in mod_devicetable.h\n",
"section __mod_%s__<identifier>_device_table=%lu.\n"
"Fix definition of struct %s_device_id "
"in mod_devicetable.h\n",
modname, device_id, id_size, device_id, size, device_id); modname, device_id, id_size, device_id, size, device_id);
} }
/* Verify last one is a terminator */ /* Verify last one is a terminator */
for (i = 0; i < id_size; i++ ) { for (i = 0; i < id_size; i++ ) {
if (*(uint8_t*)(symval+size-id_size+i)) { if (*(uint8_t*)(symval+size-id_size+i)) {
fprintf(stderr,"%s: struct %s_device_id is %lu bytes. " fprintf(stderr,
"The last of %lu is:\n", "%s: struct %s_device_id is %lu bytes. The last of %lu is:\n",
modname, device_id, id_size, size / id_size); modname, device_id, id_size, size / id_size);
for (i = 0; i < id_size; i++ ) for (i = 0; i < id_size; i++ )
fprintf(stderr,"0x%02x ", fprintf(stderr,"0x%02x ",
*(uint8_t*)(symval+size-id_size+i) ); *(uint8_t*)(symval+size-id_size+i) );
fprintf(stderr,"\n"); fprintf(stderr,"\n");
fatal("%s: struct %s_device_id is not terminated " fatal("%s: struct %s_device_id is not terminated with a NULL entry!\n",
"with a NULL entry!\n", modname, device_id); modname, device_id);
} }
} }
} }
@ -1154,8 +1151,7 @@ static int do_amba_entry(const char *filename,
DEF_FIELD(symval, amba_id, mask); DEF_FIELD(symval, amba_id, mask);
if ((id & mask) != id) if ((id & mask) != id)
fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: " fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: id=0x%08X, mask=0x%08X. Please fix this driver.\n",
"id=0x%08X, mask=0x%08X. Please fix this driver.\n",
filename, id, mask); filename, id, mask);
p += sprintf(alias, "amba:d"); p += sprintf(alias, "amba:d");

8
scripts/mod/modpost.c
View File

@ -519,9 +519,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
int nobits = sechdrs[i].sh_type == SHT_NOBITS; int nobits = sechdrs[i].sh_type == SHT_NOBITS;
if (!nobits && sechdrs[i].sh_offset > info->size) { if (!nobits && sechdrs[i].sh_offset > info->size) {
fatal("%s is truncated. sechdrs[i].sh_offset=%lu > " fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%zu\n",
"sizeof(*hrd)=%zu\n", filename, filename, (unsigned long)sechdrs[i].sh_offset,
(unsigned long)sechdrs[i].sh_offset,
sizeof(*hdr)); sizeof(*hdr));
return 0; return 0;
} }
@ -1355,8 +1354,7 @@ static void report_extable_warnings(const char* modname, struct elf_info* elf,
get_pretty_name(is_function(tosym), get_pretty_name(is_function(tosym),
&to_pretty_name, &to_pretty_name_p); &to_pretty_name, &to_pretty_name_p);
warn("%s(%s+0x%lx): Section mismatch in reference" warn("%s(%s+0x%lx): Section mismatch in reference from the %s %s%s to the %s %s:%s%s\n",
" from the %s %s%s to the %s %s:%s%s\n",
modname, fromsec, (long)r->r_offset, from_pretty_name, modname, fromsec, (long)r->r_offset, from_pretty_name,
fromsym_name, from_pretty_name_p, fromsym_name, from_pretty_name_p,
to_pretty_name, tosec, tosym_name, to_pretty_name_p); to_pretty_name, tosec, tosym_name, to_pretty_name_p);