diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:56:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:56:05 +0200 |
| commit | e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1 (patch) | |
| tree | 07a09b5e19a4d55c4a097b280eb64bd159ca0eb9 /arch/x86/mm/init_32.c | |
| parent | b678c91aefa7ce05a5d195e0a5c7a357b62d3283 (diff) | |
| parent | 4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc (diff) | |
| download | linux-e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1.tar.bz2 | |
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/mm/init_32.c')
| -rw-r--r-- | arch/x86/mm/init_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 601b8e04e5c6..f34d275ee201 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -38,7 +38,7 @@ #include <asm/pgtable.h> #include <asm/dma.h> #include <asm/fixmap.h> -#include <asm/e820.h> +#include <asm/e820/api.h> #include <asm/apic.h> #include <asm/bugs.h> #include <asm/tlb.h> |