From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 13 May 2013 10:07:40 +0000 (+0200)
Subject: x86/EFI: fix build
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6854^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b670aceff75f9d61bfe842a09520bfccb418df7;p=xen.git

x86/EFI: fix build

... after f6254405 ("xen/arm: compile and initialize vmap") moving the
map_pages_to_xen() declaration.

Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c
index 44bc7b7670..117a5cbe43 100644
--- a/xen/arch/x86/efi/boot.c
+++ b/xen/arch/x86/efi/boot.c
@@ -8,6 +8,7 @@
 #include <xen/init.h>
 #include <xen/keyhandler.h>
 #include <xen/lib.h>
+#include <xen/mm.h>
 #include <xen/multiboot.h>
 #include <xen/pci_regs.h>
 #include <xen/pfn.h>
@@ -22,7 +23,6 @@
 #define __ASSEMBLY__ /* avoid pulling in ACPI stuff (conflicts with EFI) */
 #include <asm/fixmap.h>
 #undef __ASSEMBLY__
-#include <asm/mm.h>
 #include <asm/msr.h>
 #include <asm/processor.h>