tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

modpost: Join broken long printed messages

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>

authored by

Geert Uytterhoeven and committed by
Masahiro Yamada 0d2573a2 eb708140

+10 -16
+7 -11
scripts/mod/file2alias.c
··· 140 140 int i; 141 141 142 142 if (size % id_size || size < id_size) { 143 - fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo " 144 - "of the size of " 145 - "section __mod_%s__<identifier>_device_table=%lu.\n" 146 - "Fix definition of struct %s_device_id " 147 - "in mod_devicetable.h\n", 143 + fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo of the size of section __mod_%s__<identifier>_device_table=%lu.\n" 144 + "Fix definition of struct %s_device_id in mod_devicetable.h\n", 148 145 modname, device_id, id_size, device_id, size, device_id); 149 146 } 150 147 /* Verify last one is a terminator */ 151 148 for (i = 0; i < id_size; i++ ) { 152 149 if (*(uint8_t*)(symval+size-id_size+i)) { 153 - fprintf(stderr,"%s: struct %s_device_id is %lu bytes. " 154 - "The last of %lu is:\n", 150 + fprintf(stderr, 151 + "%s: struct %s_device_id is %lu bytes. The last of %lu is:\n", 155 152 modname, device_id, id_size, size / id_size); 156 153 for (i = 0; i < id_size; i++ ) 157 154 fprintf(stderr,"0x%02x ", 158 155 *(uint8_t*)(symval+size-id_size+i) ); 159 156 fprintf(stderr,"\n"); 160 - fatal("%s: struct %s_device_id is not terminated " 161 - "with a NULL entry!\n", modname, device_id); 157 + fatal("%s: struct %s_device_id is not terminated with a NULL entry!\n", 158 + modname, device_id); 162 159 } 163 160 } 164 161 } ··· 1151 1154 DEF_FIELD(symval, amba_id, mask); 1152 1155 1153 1156 if ((id & mask) != id) 1154 - fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: " 1155 - "id=0x%08X, mask=0x%08X. Please fix this driver.\n", 1157 + fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: id=0x%08X, mask=0x%08X. Please fix this driver.\n", 1156 1158 filename, id, mask); 1157 1159 1158 1160 p += sprintf(alias, "amba:d");
+3 -5
scripts/mod/modpost.c
··· 519 519 int nobits = sechdrs[i].sh_type == SHT_NOBITS; 520 520 521 521 if (!nobits && sechdrs[i].sh_offset > info->size) { 522 - fatal("%s is truncated. sechdrs[i].sh_offset=%lu > " 523 - "sizeof(*hrd)=%zu\n", filename, 524 - (unsigned long)sechdrs[i].sh_offset, 522 + fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%zu\n", 523 + filename, (unsigned long)sechdrs[i].sh_offset, 525 524 sizeof(*hdr)); 526 525 return 0; 527 526 } ··· 1354 1355 get_pretty_name(is_function(tosym), 1355 1356 &to_pretty_name, &to_pretty_name_p); 1356 1357 1357 - warn("%s(%s+0x%lx): Section mismatch in reference" 1358 - " from the %s %s%s to the %s %s:%s%s\n", 1358 + warn("%s(%s+0x%lx): Section mismatch in reference from the %s %s%s to the %s %s:%s%s\n", 1359 1359 modname, fromsec, (long)r->r_offset, from_pretty_name, 1360 1360 fromsym_name, from_pretty_name_p, 1361 1361 to_pretty_name, tosec, tosym_name, to_pretty_name_p);