Skip to content

Commit bbbaf06

Browse files
Vasily GorbikAlexander Gordeev
authored andcommitted
s390/boot: Use decimal format specifiers in boot messages
Now that boot_printk() supports decimal specifiers, update boot_emerg() messages to use %d and %lu instead of %x and %lx where appropriate. Signed-off-by: Vasily Gorbik <[email protected]> Acked-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent 42fc158 commit bbbaf06

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/s390/boot/pgm_check_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void print_pgm_check_info(void)
4040
boot_emerg("Linux version %s\n", kernel_version);
4141
if (!is_prot_virt_guest() && early_command_line[0])
4242
boot_emerg("Kernel command line: %s\n", early_command_line);
43-
boot_emerg("Kernel fault: interruption code %04x ilc:%x\n",
43+
boot_emerg("Kernel fault: interruption code %04x ilc:%d\n",
4444
get_lowcore()->pgm_code, get_lowcore()->pgm_ilc >> 1);
4545
if (kaslr_enabled()) {
4646
boot_emerg("Kernel random base: %lx\n", __kaslr_offset);

arch/s390/boot/physmem_info.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,20 @@ static void die_oom(unsigned long size, unsigned long align, unsigned long min,
244244
boot_emerg("Linux version %s\n", kernel_version);
245245
if (!is_prot_virt_guest() && early_command_line[0])
246246
boot_emerg("Kernel command line: %s\n", early_command_line);
247-
boot_emerg("Out of memory allocating %lx bytes %lx aligned in range %lx:%lx\n",
247+
boot_emerg("Out of memory allocating %lu bytes 0x%lx aligned in range %lx:%lx\n",
248248
size, align, min, max);
249249
boot_emerg("Reserved memory ranges:\n");
250250
for_each_physmem_reserved_range(t, range, &start, &end) {
251251
boot_emerg("%016lx %016lx %s\n", start, end, get_rr_type_name(t));
252252
total_reserved_mem += end - start;
253253
}
254-
boot_emerg("Usable online memory ranges (info source: %s [%x]):\n",
254+
boot_emerg("Usable online memory ranges (info source: %s [%d]):\n",
255255
get_physmem_info_source(), physmem_info.info_source);
256256
for_each_physmem_usable_range(i, &start, &end) {
257257
boot_emerg("%016lx %016lx\n", start, end);
258258
total_mem += end - start;
259259
}
260-
boot_emerg("Usable online memory total: %lx Reserved: %lx Free: %lx\n",
260+
boot_emerg("Usable online memory total: %lu Reserved: %lu Free: %lu\n",
261261
total_mem, total_reserved_mem,
262262
total_mem > total_reserved_mem ? total_mem - total_reserved_mem : 0);
263263
print_stacktrace(current_frame_address());

0 commit comments

Comments
 (0)