From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 4 Feb 2010 08:54:27 +0000 (+0000)
Subject: xen/i386: dma_addr_t must always be 64 bits wide
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3ff9ecf5c2fc2b8874ebf69abc149cfa2507125e;p=legacy%2Flinux-2.6.18-xen.git

xen/i386: dma_addr_t must always be 64 bits wide

Irrespective of CONFIG_HIGHMEM settings, DMA addresses must always be
64-bit wide.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index 4b4b295c..2b3212da 100644
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -50,7 +50,7 @@ typedef unsigned long long u64;
 
 /* DMA addresses come in generic and 64-bit flavours.  */
 
-#ifdef CONFIG_HIGHMEM64G
+#if defined(CONFIG_XEN) || defined(CONFIG_HIGHMEM64G)
 typedef u64 dma_addr_t;
 #else
 typedef u32 dma_addr_t;