Skip to content

Commit

Permalink
s390/boot: Use decimal format specifiers in boot messages
Browse files Browse the repository at this point in the history
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 <gor@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
  • Loading branch information
Vasily Gorbik authored and Alexander Gordeev committed Jan 26, 2025
1 parent 42fc158 commit bbbaf06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/s390/boot/pgm_check_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void print_pgm_check_info(void)
boot_emerg("Linux version %s\n", kernel_version);
if (!is_prot_virt_guest() && early_command_line[0])
boot_emerg("Kernel command line: %s\n", early_command_line);
boot_emerg("Kernel fault: interruption code %04x ilc:%x\n",
boot_emerg("Kernel fault: interruption code %04x ilc:%d\n",
get_lowcore()->pgm_code, get_lowcore()->pgm_ilc >> 1);
if (kaslr_enabled()) {
boot_emerg("Kernel random base: %lx\n", __kaslr_offset);
Expand Down
6 changes: 3 additions & 3 deletions arch/s390/boot/physmem_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,20 @@ static void die_oom(unsigned long size, unsigned long align, unsigned long min,
boot_emerg("Linux version %s\n", kernel_version);
if (!is_prot_virt_guest() && early_command_line[0])
boot_emerg("Kernel command line: %s\n", early_command_line);
boot_emerg("Out of memory allocating %lx bytes %lx aligned in range %lx:%lx\n",
boot_emerg("Out of memory allocating %lu bytes 0x%lx aligned in range %lx:%lx\n",
size, align, min, max);
boot_emerg("Reserved memory ranges:\n");
for_each_physmem_reserved_range(t, range, &start, &end) {
boot_emerg("%016lx %016lx %s\n", start, end, get_rr_type_name(t));
total_reserved_mem += end - start;
}
boot_emerg("Usable online memory ranges (info source: %s [%x]):\n",
boot_emerg("Usable online memory ranges (info source: %s [%d]):\n",
get_physmem_info_source(), physmem_info.info_source);
for_each_physmem_usable_range(i, &start, &end) {
boot_emerg("%016lx %016lx\n", start, end);
total_mem += end - start;
}
boot_emerg("Usable online memory total: %lx Reserved: %lx Free: %lx\n",
boot_emerg("Usable online memory total: %lu Reserved: %lu Free: %lu\n",
total_mem, total_reserved_mem,
total_mem > total_reserved_mem ? total_mem - total_reserved_mem : 0);
print_stacktrace(current_frame_address());
Expand Down

0 comments on commit bbbaf06

Please sign in to comment.