[Xen-changelog] [linux-2.6.18-xen] [IA64] Define paddr_t.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1181684430 21600
# Node ID 50306c16650087922da4b54b4d222cfd8d17697a
# Parent  245902ee7ce0c1499c172b3a9240b8e2ede45a5f
[IA64] Define paddr_t.

Temporary build workaround

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 include/asm-ia64/maddr.h    |    3 +++
 include/asm-ia64/sn/types.h |    2 ++
 2 files changed, 5 insertions(+)

diff -r 245902ee7ce0 -r 50306c166500 include/asm-ia64/maddr.h
--- a/include/asm-ia64/maddr.h  Mon Jun 11 14:59:53 2007 -0600
+++ b/include/asm-ia64/maddr.h  Tue Jun 12 15:40:30 2007 -0600
@@ -103,5 +103,8 @@ mfn_to_local_pfn(unsigned long mfn)
 #define set_phys_to_machine(pfn, mfn) do { } while (0)
 
 typedef unsigned long maddr_t; // to compile netback, netfront
+#ifndef _ASM_IA64_SN_TYPES_H /* paddr_t is defined in asm-ia64/sn/types.h */
+typedef unsigned long paddr_t;
+#endif
 
 #endif /* _ASM_IA64_MADDR_H */
diff -r 245902ee7ce0 -r 50306c166500 include/asm-ia64/sn/types.h
--- a/include/asm-ia64/sn/types.h       Mon Jun 11 14:59:53 2007 -0600
+++ b/include/asm-ia64/sn/types.h       Tue Jun 12 15:40:30 2007 -0600
@@ -20,7 +20,9 @@ typedef unsigned char slabid_t;       /* slab 
 typedef unsigned char  slabid_t;       /* slab (asic) within slot */
 typedef u64 nic_t;
 typedef unsigned long iopaddr_t;
+#ifndef _ASM_IA64_MADDR_H /* paddr_t is defined in asm-ia64/maddr.h */
 typedef unsigned long paddr_t;
+#endif
 typedef short cnodeid_t;
 
 #endif /* _ASM_IA64_SN_TYPES_H */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog