KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix a small #ifdef bug in the noncoherent dma check rework

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37791
This commit is contained in:
Felix Fietkau 2013-08-15 09:29:53 +00:00
parent e27f67b30a
commit d16060d5a3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
View file

@ -40,19 +40,21 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/arch/mips/include/asm/dma-coherence.h --- a/arch/mips/include/asm/dma-coherence.h
+++ b/arch/mips/include/asm/dma-coherence.h +++ b/arch/mips/include/asm/dma-coherence.h
@@ -9,7 +9,14 @@ @@ -9,7 +9,16 @@
#ifndef __ASM_DMA_COHERENCE_H #ifndef __ASM_DMA_COHERENCE_H
#define __ASM_DMA_COHERENCE_H #define __ASM_DMA_COHERENCE_H
+#ifdef CONFIG_DMA_MAYBE_COHERENT +#ifdef CONFIG_DMA_MAYBE_COHERENT
extern int coherentio; extern int coherentio;
extern int hw_coherentio; extern int hw_coherentio;
+#elif defined(CONFIG_DMA_COHERENT) +#else
+#ifdef CONFIG_DMA_COHERENT
+#define coherentio 1 +#define coherentio 1
+#else +#else
+#define coherentio 0 +#define coherentio 0
+#endif +#endif
+#define hw_coherentio 0 +#define hw_coherentio 0
+#endif /* CONFIG_DMA_MAYBE_COHERENT */
#endif #endif
--- a/arch/mips/include/asm/mach-generic/dma-coherence.h --- a/arch/mips/include/asm/mach-generic/dma-coherence.h