Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
+7
-1
+1
-1
arch/x86/boot/compressed/misc.c
+1
-1
arch/x86/boot/compressed/misc.c
+6
arch/x86/mm/init.c
+6
arch/x86/mm/init.c
···
5
5
#include <linux/memblock.h>
6
6
#include <linux/swapfile.h>
7
7
#include <linux/swapops.h>
8
+
#include <linux/kmemleak.h>
8
9
9
10
#include <asm/set_memory.h>
10
11
#include <asm/e820/api.h>
···
767
766
if (debug_pagealloc_enabled()) {
768
767
pr_info("debug: unmapping init [mem %#010lx-%#010lx]\n",
769
768
begin, end - 1);
769
+
/*
770
+
* Inform kmemleak about the hole in the memory since the
771
+
* corresponding pages will be unmapped.
772
+
*/
773
+
kmemleak_free_part((void *)begin, end - begin);
770
774
set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
771
775
} else {
772
776
/*