From a3eabb10d524fcae1411e0d6dd58175e4af09b38 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Mon, 8 Sep 2008 16:19:11 -0700
Subject: [PATCH] --- yaml --- r: 112577 b: refs/heads/master c:
 9fcaff0e660d886e9a766460adbe558dd25de31b h: refs/heads/master i:   112575:
 390ad35551ebd85bf1f85049089d03582b347519 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-x86/dma-mapping.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e3cd0397d054..032a77f920ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 640aebfe014554ced9c38d2564e38862e488d0eb
+refs/heads/master: 9fcaff0e660d886e9a766460adbe558dd25de31b
diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
index 0cc022b9a4a1..56075320b813 100644
--- a/trunk/include/asm-x86/dma-mapping.h
+++ b/trunk/include/asm-x86/dma-mapping.h
@@ -253,9 +253,9 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
 
 static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
 {
+#ifdef CONFIG_X86_64
 	unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
 
-#ifdef CONFIG_X86_64
 	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
 		gfp |= GFP_DMA32;
 #endif