From cf53c3a5065210545839063efee769cb3cb2c42c Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Sun, 10 Aug 2008 18:05:09 +0100
Subject: [PATCH] x86_64: Build fixes. Signed-off-by: Keir Fraser
 <keir.fraser@citrix.com>

---
 arch/x86_64/kernel/e820-xen.c     | 1 +
 drivers/xen/core/machine_reboot.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86_64/kernel/e820-xen.c b/arch/x86_64/kernel/e820-xen.c
index 67097781..e713667c 100644
--- a/arch/x86_64/kernel/e820-xen.c
+++ b/arch/x86_64/kernel/e820-xen.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/kexec.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 
 #include <asm/pgtable.h>
 #include <asm/page.h>
diff --git a/drivers/xen/core/machine_reboot.c b/drivers/xen/core/machine_reboot.c
index 7ff08ff1..f92c9087 100644
--- a/drivers/xen/core/machine_reboot.c
+++ b/drivers/xen/core/machine_reboot.c
@@ -185,7 +185,8 @@ static int take_machine_down(void *_suspend)
 		 * in fast-suspend mode as that implies a new enough Xen.
 		 */
 		if (!suspend->fast_suspend)
-			xen_new_user_pt(__pa(__user_pgd(current->active_mm->pgd));
+			xen_new_user_pt(__pa(__user_pgd(
+				current->active_mm->pgd)));
 #endif
 	}
 	time_resume();
-- 
2.39.5