diff options
| author | Ingo Molnar | 2017-04-11 08:56:05 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-04-11 08:56:05 +0200 |
| commit | e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1 (patch) | |
| tree | 07a09b5e19a4d55c4a097b280eb64bd159ca0eb9 /arch/x86/kernel/apic/x2apic_uv_x.c | |
| parent | Revert "x86/mm/numa: Remove numa_nodemask_from_meminfo()" (diff) | |
| parent | Merge branch 'WIP.x86/boot' into x86/boot, to pick up ready branch (diff) | |
| download | kernel-qcow2-linux-e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1.tar.gz kernel-qcow2-linux-e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1.tar.xz kernel-qcow2-linux-e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1.zip | |
Merge branch 'x86/boot' into x86/mm, to avoid conflict
There's a conflict between ongoing level-5 paging support and
the E820 rewrite. Since the E820 rewrite is essentially ready,
merge it into x86/mm to reduce tree conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 86f20cc0a65e..b487b3a01615 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -34,6 +34,7 @@ #include <asm/uv/bios.h> #include <asm/uv/uv.h> #include <asm/apic.h> +#include <asm/e820/api.h> #include <asm/ipi.h> #include <asm/smp.h> #include <asm/x86_init.h> |