Commit bbbaf061 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Alexander Gordeev
Browse files

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: default avatarVasily Gorbik <gor@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 42fc158c

arch/s390/boot/pgm_check_info.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/s390/boot/physmem_info.c

+3 −3
Original line number Diff line number Diff line
@@ -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());