ia64/xen-unstable

changeset 9970:32db03c64a12

[IA64] linux: macro clean up

remove bogus macro usage in asm-ia64/hypercall.h

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Tue May 09 11:32:08 2006 -0600 (2006-05-09)
parents f090ab3f06e7
children ada6dba78b6e
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/page.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Tue May 09 11:29:34 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Tue May 09 11:32:08 2006 -0600
     1.3 @@ -478,12 +478,12 @@ HYPERVISOR_add_physmap(unsigned long gpf
     1.4  	return ret;
     1.5  }
     1.6  #else
     1.7 -#define HYPERVISOR_ioremap(ioaddr, size)		({ioaddr;})
     1.8 -#define HYPERVISOR_phystomach(gpfn)			({gpfn;})
     1.9 -#define HYPERVISOR_machtophys(mfn)			({mfn;})
    1.10 +#define HYPERVISOR_ioremap(ioaddr, size)		(ioaddr)
    1.11 +#define HYPERVISOR_phystomach(gpfn)			(gpfn)
    1.12 +#define HYPERVISOR_machtophys(mfn)			(mfn)
    1.13  #define HYPERVISOR_populate_physmap(gpfn, extent_order, address_bits) \
    1.14 -							({0;})
    1.15 -#define HYPERVISOR_zap_physmap(gpfn, extent_order)	({0;})
    1.16 -#define HYPERVISOR_add_physmap(gpfn, mfn, flags)	({0;})
    1.17 +							(0)
    1.18 +#define HYPERVISOR_zap_physmap(gpfn, extent_order)	(0)
    1.19 +#define HYPERVISOR_add_physmap(gpfn, mfn, flags)	(0)
    1.20  #endif
    1.21  #endif /* __HYPERCALL_H__ */
     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Tue May 09 11:29:34 2006 -0600
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Tue May 09 11:32:08 2006 -0600
     2.3 @@ -162,7 +162,7 @@ xen_destroy_contiguous_region(unsigned l
     2.4  		__xen_destroy_contiguous_region(vstart, order);
     2.5  }
     2.6  #else
     2.7 -#define xen_create_contiguous_region(vstart, order, address_bits)	({0;})
     2.8 +#define xen_create_contiguous_region(vstart, order, address_bits)	(0)
     2.9  #define xen_destroy_contiguous_region(vstart, order)	do {} while (0)
    2.10  #endif
    2.11  
     3.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h	Tue May 09 11:29:34 2006 -0600
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h	Tue May 09 11:32:08 2006 -0600
     3.3 @@ -279,11 +279,11 @@ machine_to_phys_for_dma(unsigned long ma
     3.4  #define set_phys_to_machine(pfn, mfn) do { } while (0)
     3.5  #define xen_machphys_update(mfn, pfn) do { } while (0)
     3.6  
     3.7 -#define mfn_to_pfn(mfn)			({(mfn);})
     3.8 -#define mfn_to_virt(mfn)		({__va((mfn) << PAGE_SHIFT);})
     3.9 -#define pfn_to_mfn(pfn)			({(pfn);})
    3.10 -#define virt_to_mfn(virt)		({__pa(virt) >> PAGE_SHIFT;})
    3.11 -#define virt_to_machine(virt)		({__pa(virt);}) // for tpmfront.c
    3.12 +#define mfn_to_pfn(mfn)			(mfn)
    3.13 +#define mfn_to_virt(mfn)		(__va((mfn) << PAGE_SHIFT))
    3.14 +#define pfn_to_mfn(pfn)			(pfn)
    3.15 +#define virt_to_mfn(virt)		(__pa(virt) >> PAGE_SHIFT)
    3.16 +#define virt_to_machine(virt)		__pa(virt) // for tpmfront.c
    3.17  
    3.18  #endif /* CONFIG_XEN_IA64_DOM0_VP */
    3.19  #endif /* CONFIG_XEN */