git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dma-mapping: avoid speculative prefetching fix
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
cache-v7.S
diff --git
a/arch/arm/mm/cache-v7.S
b/arch/arm/mm/cache-v7.S
index
39e3fb3
..
3953920
100644
(file)
--- a/
arch/arm/mm/cache-v7.S
+++ b/
arch/arm/mm/cache-v7.S
@@
-329,9
+329,10
@@
ENDPROC(v7_dma_flush_range)
*/
ENTRY(v7_dma_map_area)
add r1, r1, r0
*/
ENTRY(v7_dma_map_area)
add r1, r1, r0
- teq r2, #DMA_FROM_DEVICE
- beq v7_dma_inv_range
- b v7_dma_clean_range
+ cmp r2, #DMA_TO_DEVICE
+ beq v7_dma_clean_range
+ bcs v7_dma_inv_range
+ b v7_dma_flush_range
ENDPROC(v7_dma_map_area)
/*
ENDPROC(v7_dma_map_area)
/*
@@
-341,9
+342,6
@@
ENDPROC(v7_dma_map_area)
* - dir - DMA direction
*/
ENTRY(v7_dma_unmap_area)
* - dir - DMA direction
*/
ENTRY(v7_dma_unmap_area)
- add r1, r1, r0
- teq r2, #DMA_TO_DEVICE
- bne v7_dma_inv_range
mov pc, lr
ENDPROC(v7_dma_unmap_area)
mov pc, lr
ENDPROC(v7_dma_unmap_area)