ia64/xen-unstable

changeset 9400:487ff011626c

[IA64] obvious compilation fix (hypercall.h, hypervisor.h)

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Fri Mar 24 10:36:14 2006 -0700 (2006-03-24)
parents 80eaf1cb8903
children 138c76d5e493
files linux-2.6-xen-sparse/include/asm-ia64/hypercall.h linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Fri Mar 24 10:34:40 2006 -0700
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Fri Mar 24 10:36:14 2006 -0700
     1.3 @@ -37,6 +37,7 @@
     1.4  #include <xen/interface/sched.h>
     1.5  #include <xen/interface/dom0_ops.h>
     1.6  #include <linux/errno.h>
     1.7 +#include <asm/hypervisor.h> // for jiffies_to_st()
     1.8  
     1.9  /* FIXME: temp place to hold these page related macros */
    1.10  #include <asm/page.h>
     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri Mar 24 10:34:40 2006 -0700
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri Mar 24 10:36:14 2006 -0700
     2.3 @@ -41,6 +41,7 @@
     2.4  #include <xen/interface/dom0_ops.h>
     2.5  #include <asm/ptrace.h>
     2.6  #include <asm/page.h>
     2.7 +#include <asm/xen/privop.h> // for running_on_xen
     2.8  
     2.9  extern shared_info_t *HYPERVISOR_shared_info;
    2.10  extern start_info_t *xen_start_info;
    2.11 @@ -52,8 +53,6 @@ int xen_init(void);
    2.12  /* Turn jiffies into Xen system time. XXX Implement me. */
    2.13  #define jiffies_to_st(j)	0
    2.14  
    2.15 -#include <asm/hypercall.h>
    2.16 -
    2.17  // for drivers/xen/privcmd/privcmd.c
    2.18  #define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e)
    2.19  #define	pfn_to_mfn(x)	(x)