# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Date 1185846467 -32400 # Node ID 656188e167f9a0f400614a82c3ff06224d266fcf # Parent 277cd46fffe9a6e5b036758c638a456b82ea0cbe minor clean of hypervisor.h to removed one #ifdef. PATCHNAME: hypervisor_h_minor_clean_up Signed-off-by: Isaku Yamahata diff -r 277cd46fffe9 -r 656188e167f9 include/asm-ia64/hypervisor.h --- a/include/asm-ia64/hypervisor.h Tue Oct 02 11:32:27 2007 -0600 +++ b/include/asm-ia64/hypervisor.h Tue Jul 31 10:47:47 2007 +0900 @@ -140,12 +140,6 @@ int privcmd_mmap(struct file * file, str #define pte_mfn(_x) pte_pfn(_x) #define phys_to_machine_mapping_valid(_x) (1) -#endif /* !CONFIG_VMX_GUEST */ - -#define __pte_ma(_x) ((pte_t) {(_x)}) /* unmodified use */ -#define pfn_pte_ma(_x,_y) __pte_ma(0) /* unmodified use */ - -#ifndef CONFIG_VMX_GUEST void xen_contiguous_bitmap_init(unsigned long end_pfn); int __xen_create_contiguous_region(unsigned long vstart, unsigned int order, unsigned int address_bits); static inline int @@ -177,6 +171,9 @@ int xen_limit_pages_to_max_mfn(struct pa #define HAVE_XEN_POST_SUSPEND void xen_post_suspend(int suspend_cancelled); #endif /* !CONFIG_VMX_GUEST */ + +#define __pte_ma(_x) ((pte_t) {(_x)}) /* unmodified use */ +#define pfn_pte_ma(_x,_y) __pte_ma(0) /* unmodified use */ // for netfront.c, netback.c #define MULTI_UVMFLAGS_INDEX 0 //XXX any value