Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch

[karo-tx-linux.git] / arch / x86 / mm / kasan_init_64.c

diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 0493c17b8a516f4212bc21fe5e32d0bce466c24f..66d20174e35f5222a29be27553a78c54b257ca88 100644 (file)
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -4,13 +4,15 @@
 #include <linux/kdebug.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/sched/task.h>
 #include <linux/vmalloc.h>
 
+#include <asm/e820/types.h>
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
 
 extern pgd_t early_level4_pgt[PTRS_PER_PGD];
-extern struct range pfn_mapped[E820_X_MAX];
+extern struct range pfn_mapped[E820_MAX_ENTRIES];
 
 static int __init map_range(struct range *range)
 {
@@ -102,7 +104,7 @@ void __init kasan_init(void)
        kasan_populate_zero_shadow((void *)KASAN_SHADOW_START,
                        kasan_mem_to_shadow((void *)PAGE_OFFSET));
 
-       for (i = 0; i < E820_X_MAX; i++) {
+       for (i = 0; i < E820_MAX_ENTRIES; i++) {
                if (pfn_mapped[i].end == 0)
                        break;