diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:53:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:53:14 +0100 |
| commit | 57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e (patch) | |
| tree | eaa43171e82737e8b33239e2e9bc3b4de67b7ddd /arch/x86/xen | |
| parent | 02df083201272c0c2e061b18d9c20635974abf6d (diff) | |
| parent | 186525bd6b83efc592672e2d6185e4d7c810d2b4 (diff) | |
| download | linux-57ad87ddce79b6d54f8e442d0ecf4b5bbe8c5a9e.tar.bz2 | |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/mmu_pv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index c8dbee62ec2a..bbba8b17829a 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -67,7 +67,7 @@ #include <asm/linkage.h> #include <asm/page.h> #include <asm/init.h> -#include <asm/pat.h> +#include <asm/memtype.h> #include <asm/smp.h> #include <asm/tlb.h> |