ia64/linux-2.6.18-xen.hg

changeset 641:56902bb0ce6d

x86_64: Build fixes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sun Aug 10 18:05:09 2008 +0100 (2008-08-10)
parents 9c730ffb48f7
children cdd156cb645b
files arch/x86_64/kernel/e820-xen.c drivers/xen/core/machine_reboot.c
line diff
     1.1 --- a/arch/x86_64/kernel/e820-xen.c	Fri Aug 08 14:24:33 2008 +0100
     1.2 +++ b/arch/x86_64/kernel/e820-xen.c	Sun Aug 10 18:05:09 2008 +0100
     1.3 @@ -16,6 +16,7 @@
     1.4  #include <linux/string.h>
     1.5  #include <linux/kexec.h>
     1.6  #include <linux/module.h>
     1.7 +#include <linux/mm.h>
     1.8  
     1.9  #include <asm/pgtable.h>
    1.10  #include <asm/page.h>
     2.1 --- a/drivers/xen/core/machine_reboot.c	Fri Aug 08 14:24:33 2008 +0100
     2.2 +++ b/drivers/xen/core/machine_reboot.c	Sun Aug 10 18:05:09 2008 +0100
     2.3 @@ -185,7 +185,8 @@ static int take_machine_down(void *_susp
     2.4  		 * in fast-suspend mode as that implies a new enough Xen.
     2.5  		 */
     2.6  		if (!suspend->fast_suspend)
     2.7 -			xen_new_user_pt(__pa(__user_pgd(current->active_mm->pgd));
     2.8 +			xen_new_user_pt(__pa(__user_pgd(
     2.9 +				current->active_mm->pgd)));
    2.10  #endif
    2.11  	}
    2.12  	time_resume();