Commit 5b51ae96 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/boot: Call get_rsdp_addr() after console_init()



... so that early debugging output from the RSDP parsing code can be
visible and collected.

Suggested-by: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Chao Fan <fanc.fnst@cn.fujitsu.com>
Cc: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Cc: Kairui Song <kasong@redhat.com>
Cc: kexec@lists.infradead.org
Cc: x86@kernel.org
parent 8e44c784
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -351,9 +351,6 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,
	/* Clear flags intended for solely in-kernel use. */
	boot_params->hdr.loadflags &= ~KASLR_FLAG;

	/* Save RSDP address for later use. */
	boot_params->acpi_rsdp_addr = get_rsdp_addr();

	sanitize_boot_params(boot_params);

	if (boot_params->screen_info.orig_video_mode == 7) {
@@ -368,6 +365,14 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,
	cols = boot_params->screen_info.orig_video_cols;

	console_init();

	/*
	 * Save RSDP address for later use. Have this after console_init()
	 * so that early debugging output from the RSDP parsing code can be
	 * collected.
	 */
	boot_params->acpi_rsdp_addr = get_rsdp_addr();

	debug_putstr("early console in extract_kernel\n");

	free_mem_ptr     = heap;	/* Heap */