ia64/xen-unstable

changeset 11417:d4e85f8453ba

[IA64] Cleanup for PV-on-HVM for IPF

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Sun Sep 10 14:26:27 2006 -0600 (2006-09-10)
parents 685bf9b75eb1
children 5791030e6473
files linux-2.6-xen-sparse/include/asm-ia64/hypercall.h linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h linux-2.6-xen-sparse/include/asm-ia64/maddr.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Mon Sep 04 14:48:03 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Sun Sep 10 14:26:27 2006 -0600
     1.3 @@ -205,8 +205,12 @@ static inline int
     1.4  }
     1.5  
     1.6  #include <xen/interface/memory.h>
     1.7 +#ifdef CONFIG_VMX_GUEST
     1.8 +# define ia64_xenmem_reservation_op(op, xmr) (0)
     1.9 +#else
    1.10  int ia64_xenmem_reservation_op(unsigned long op,
    1.11  		   struct xen_memory_reservation* reservation__);
    1.12 +#endif
    1.13  static inline int
    1.14  HYPERVISOR_memory_op(
    1.15      unsigned int cmd, void *arg)
     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Mon Sep 04 14:48:03 2006 -0600
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Sun Sep 10 14:26:27 2006 -0600
     2.3 @@ -33,13 +33,17 @@
     2.4  #ifndef __HYPERVISOR_H__
     2.5  #define __HYPERVISOR_H__
     2.6  
     2.7 -#if !defined(CONFIG_XEN) && !defined(CONFIG_VMX_GUEST)
     2.8 -#define is_running_on_xen()			(0)
     2.9 -#define HYPERVISOR_ioremap(offset, size)	(offset)
    2.10 -#else
    2.11 +#ifdef CONFIG_XEN
    2.12  extern int running_on_xen;
    2.13  #define is_running_on_xen()			(running_on_xen)
    2.14 -#endif
    2.15 +#else /* CONFIG_XEN */
    2.16 +# ifdef CONFIG_VMX_GUEST
    2.17 +#  define is_running_on_xen()			(1)
    2.18 +# else /* CONFIG_VMX_GUEST */
    2.19 +#  define is_running_on_xen()			(0)
    2.20 +#  define HYPERVISOR_ioremap(offset, size)	(offset)
    2.21 +# endif /* CONFIG_VMX_GUEST */
    2.22 +#endif /* CONFIG_XEN */
    2.23  
    2.24  #if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST)
    2.25  #include <linux/config.h>
     3.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h	Mon Sep 04 14:48:03 2006 -0600
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h	Sun Sep 10 14:26:27 2006 -0600
     3.3 @@ -81,7 +81,11 @@ mfn_to_local_pfn(unsigned long mfn)
     3.4  #define virt_to_machine(virt) __pa(virt) // for tpmfront.c
     3.5  
     3.6  #define set_phys_to_machine(pfn, mfn) do { } while (0)
     3.7 +#ifdef CONFIG_VMX_GUEST
     3.8 +extern void xen_machphys_update(unsigned long mfn, unsigned long pfn);
     3.9 +#else /* CONFIG_VMX_GUEST */
    3.10  #define xen_machphys_update(mfn, pfn) do { } while (0)
    3.11 +#endif /* CONFIG_VMX_GUEST */
    3.12  
    3.13  typedef unsigned long maddr_t;	// to compile netback, netfront
    3.14