Commit d1725ca6 authored Feb 02, 2023 by Vasily Gorbik Committed by Heiko Carstens Feb 06, 2023

s390/boot: move detect_facilities() after cmd line parsing



Facilities setup has to be done after "facilities" command line option
parsing, it might set extra or remove existing facilities bits for
testing purposes.

Fixes: bb1520d5 ("s390/mm: start kernel with DAT enabled")
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

parent 26ced812

arch/s390/boot/startup.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -283,8 +283,6 @@ void startup_kernel(void)
		void *img;
		psw_t psw;

		detect_facilities();

		initrd_data.start = parmarea.initrd_start;
		initrd_data.size = parmarea.initrd_size;
		oldmem_data.start = parmarea.oldmem_base;
		@@ -300,6 +298,7 @@ void startup_kernel(void)
		sclp_early_read_info();
		setup_boot_command_line();
		parse_boot_command_line();
		detect_facilities();
		sanitize_prot_virt_host();
		max_physmem_end = detect_memory(&safe_addr);
		setup_ident_map_size(max_physmem_end);