From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 11 Apr 2017 06:49:31 +0000 (+0200)
Subject: Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch
X-Git-Tag: v4.12-rc1~150^2~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc;p=linux-2.6-block.git

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

The E820 rework in WIP.x86/boot has gone through a couple of weeks
of exposure in -tip, merge it in a wider fashion.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc
diff --cc arch/x86/kernel/cpu/centaur.c
index adc0ebd8bed0,0e150d6dc64c..106bd3318121
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@@ -1,9 -1,8 +1,9 @@@
  
  #include <linux/sched.h>
 +#include <linux/sched/clock.h>
  
  #include <asm/cpufeature.h>
- #include <asm/e820.h>
+ #include <asm/e820/api.h>
  #include <asm/mtrr.h>
  #include <asm/msr.h>
  
diff --cc arch/x86/mm/kasan_init_64.c
index 8d63d7a104c3,7d02845ec456..66d20174e35f
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@@ -4,9 -4,9 +4,10 @@@
  #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>