---

yaml --- r: 112577 b: refs/heads/master c: 9fcaff0 h: refs/heads/master i: 112575: 390ad35 v: v3
git-mirror · Sep 9, 2008 · a3eabb1 · a3eabb1
1 parent 1b6538b
commit a3eabb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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