aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2008-09-08 19:19:11 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-09 02:57:09 -0400
commit9fcaff0e660d886e9a766460adbe558dd25de31b (patch)
tree79762aff70c94bc6aa5e63b8d6254d2aaa296d98 /include
parent640aebfe014554ced9c38d2564e38862e488d0eb (diff)
x86: unused variable in dma_alloc_coherent_gfp_flags()
Fixed a warning caused by a badly placed ifdef. Signed-off-by: Steven Noonan <steven@uplinklabs.net> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 0cc022b9a4a1..56075320b813 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -253,9 +253,9 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
253 253
254static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp) 254static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
255{ 255{
256#ifdef CONFIG_X86_64
256 unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp); 257 unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
257 258
258#ifdef CONFIG_X86_64
259 if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) 259 if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
260 gfp |= GFP_DMA32; 260 gfp |= GFP_DMA32;
261#endif 261#endif