Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (037904a2) · Commits · 戴 / test

Pull x86 fixes from Ingo Molnar: - Fix an early boot crash in the RSDP parsing code by effectively turning off the parsing call - we ran out of time but want to fix the regression. The more involved fix is being worked on. - Fix a crash that can trigger in the kmemlek code. * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Fix a crash with kmemleak_scan() x86/boot: Disable RSDP parsing temporarily

arch/x86/boot/compressed/misc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ asmlinkage __visible void extract_kernel(void rmode, memptr heap,
		boot_params->hdr.loadflags &= ~KASLR_FLAG;

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

		sanitize_boot_params(boot_params);

arch/x86/mm/init.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include <linux/memblock.h>
		#include <linux/swapfile.h>
		#include <linux/swapops.h>
		#include <linux/kmemleak.h>

		#include <asm/set_memory.h>
		#include <asm/e820/api.h>
		@@ -766,6 +767,11 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
		if (debug_pagealloc_enabled()) {
		pr_info("debug: unmapping init [mem %#010lx-%#010lx]\n",
		begin, end - 1);
		/*
		* Inform kmemleak about the hole in the memory since the
		* corresponding pages will be unmapped.
		*/
		kmemleak_free_part((void *)begin, end - begin);
		set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
		} else {
		/*

Admin message