# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 32db03c64a12e6e50f80755b061e079ad4fc8718
# Parent f090ab3f06e765b1e65c417cb8a39544d71ef7f3
[IA64] linux: macro clean up
remove bogus macro usage in asm-ia64/hypercall.h
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
linux-2.6-xen-sparse/include/asm-ia64/hypercall.h | 12 ++++++------
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 2 +-
linux-2.6-xen-sparse/include/asm-ia64/page.h | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff -r f090ab3f06e7 -r 32db03c64a12
linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Tue May 09 11:29:34
2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Tue May 09 11:32:08
2006 -0600
@@ -478,12 +478,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 f090ab3f06e7 -r 32db03c64a12
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Tue May 09
11:29:34 2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Tue May 09
11:32:08 2006 -0600
@@ -162,7 +162,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 f090ab3f06e7 -r 32db03c64a12
linux-2.6-xen-sparse/include/asm-ia64/page.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h Tue May 09 11:29:34
2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h Tue May 09 11:32:08
2006 -0600
@@ -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 */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home