diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 19:41:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 19:41:15 -0500 |
| commit | a771132783d3f78a51597fdcee96c6dfbae3512e (patch) | |
| tree | 3d3210a247e673b44e64a04b2c94d68126d73872 /arch/powerpc/kernel | |
| parent | 2433c41789d6aa6797ca747707b7764e88e4fb6d (diff) | |
| parent | dafdb61313e80e20cfeef7bf4653dcb47cf28591 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts
powerpc: Fix dma_map_sg() cache flushing on non coherent platforms
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 1562daf8839a..3a6eaa876ee1 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, | |||
| 75 | for_each_sg(sgl, sg, nents, i) { | 75 | for_each_sg(sgl, sg, nents, i) { |
| 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); | 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); |
| 77 | sg->dma_length = sg->length; | 77 | sg->dma_length = sg->length; |
| 78 | __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); | ||
| 78 | } | 79 | } |
| 79 | 80 | ||
| 80 | return nents; | 81 | return nents; |