# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID d55def249266671efedf9735460a2bb0ccbf5104
# Parent  bde9d73d6b12a84e893b5e1d3d724913e859e868
remove bogus macro usage in asm-ia64/hypercall.h
PATCHNAME: remove_bogus_macro_usage

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r bde9d73d6b12 -r d55def249266 linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Mon May  8 11:42:23 2006 +0900
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Mon May  8 11:42:26 2006 +0900
@@ -462,12 +462,12 @@ HYPERVISOR_add_physmap(unsigned long gpf
 	return ret;
 }
 #else
-#define HYPERVISOR_ioremap(ioaddr, size)		({ioaddr;})
-#define HYPERVISOR_phystomach(gpfn)			({gpfn;})
-#define HYPERVISOR_machtophys(mfn)			({mfn;})
+#define HYPERVISOR_ioremap(ioaddr, size)		(ioaddr)
+#define HYPERVISOR_phystomach(gpfn)			(gpfn)
+#define HYPERVISOR_machtophys(mfn)			(mfn)
 #define HYPERVISOR_populate_physmap(gpfn, extent_order, address_bits) \
-							({0;})
-#define HYPERVISOR_zap_physmap(gpfn, extent_order)	({0;})
-#define HYPERVISOR_add_physmap(gpfn, mfn, flags)	({0;})
+							(0)
+#define HYPERVISOR_zap_physmap(gpfn, extent_order)	(0)
+#define HYPERVISOR_add_physmap(gpfn, mfn, flags)	(0)
 #endif
 #endif /* __HYPERCALL_H__ */
diff -r bde9d73d6b12 -r d55def249266 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Mon May  8 11:42:23 2006 +0900
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Mon May  8 11:42:26 2006 +0900
@@ -159,7 +159,7 @@ xen_destroy_contiguous_region(unsigned l
 		__xen_destroy_contiguous_region(vstart, order);
 }
 #else
-#define xen_create_contiguous_region(vstart, order, address_bits)	({0;})
+#define xen_create_contiguous_region(vstart, order, address_bits)	(0)
 #define xen_destroy_contiguous_region(vstart, order)	do {} while (0)
 #endif
 
diff -r bde9d73d6b12 -r d55def249266 linux-2.6-xen-sparse/include/asm-ia64/page.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h	Mon May  8 11:42:23 2006 +0900
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h	Mon May  8 11:42:26 2006 +0900
@@ -279,11 +279,11 @@ machine_to_phys_for_dma(unsigned long ma
 #define set_phys_to_machine(pfn, mfn) do { } while (0)
 #define xen_machphys_update(mfn, pfn) do { } while (0)
 
-#define mfn_to_pfn(mfn)			({(mfn);})
-#define mfn_to_virt(mfn)		({__va((mfn) << PAGE_SHIFT);})
-#define pfn_to_mfn(pfn)			({(pfn);})
-#define virt_to_mfn(virt)		({__pa(virt) >> PAGE_SHIFT;})
-#define virt_to_machine(virt)		({__pa(virt);}) // for tpmfront.c
+#define mfn_to_pfn(mfn)			(mfn)
+#define mfn_to_virt(mfn)		(__va((mfn) << PAGE_SHIFT))
+#define pfn_to_mfn(pfn)			(pfn)
+#define virt_to_mfn(virt)		(__pa(virt) >> PAGE_SHIFT)
+#define virt_to_machine(virt)		__pa(virt) // for tpmfront.c
 
 #endif /* CONFIG_XEN_IA64_DOM0_VP */
 #endif /* CONFIG_XEN */