projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
640aebf
)
x86: unused variable in dma_alloc_coherent_gfp_flags()
author
Steven Noonan
<steven@uplinklabs.net>
Mon, 8 Sep 2008 23:19:11 +0000
(16:19 -0700)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 9 Sep 2008 06:57:09 +0000
(08:57 +0200)
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>
include/asm-x86/dma-mapping.h
patch
|
blob
|
history
diff --git
a/include/asm-x86/dma-mapping.h
b/include/asm-x86/dma-mapping.h
index
0cc022b
..
5607532
100644
(file)
--- 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,
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