x86_64: Build fixes.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/arch/x86_64/kernel/e820-xen.c b/arch/x86_64/kernel/e820-xen.c
index 67097781335c7ecd42828de327b3427072f558be..e713667c27254f8d8a41ee08066ac35301b0d6de 100644 (file)
--- 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 7ff08ff14b3bfff965a8a79b554bd0d72d722a63..f92c90873879ba8251e9b73bc12ae5dda09252d5 100644 (file)
--- 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();