diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/microblaze/kernel/dma.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/microblaze/kernel/dma.c')
| -rw-r--r-- | arch/microblaze/kernel/dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index 79c74659f204..393e6b2db688 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c | |||
| @@ -26,6 +26,7 @@ static inline void __dma_sync_page(unsigned long paddr, unsigned long offset, | |||
| 26 | { | 26 | { |
| 27 | switch (direction) { | 27 | switch (direction) { |
| 28 | case DMA_TO_DEVICE: | 28 | case DMA_TO_DEVICE: |
| 29 | case DMA_BIDIRECTIONAL: | ||
| 29 | flush_dcache_range(paddr + offset, paddr + offset + size); | 30 | flush_dcache_range(paddr + offset, paddr + offset + size); |
| 30 | break; | 31 | break; |
| 31 | case DMA_FROM_DEVICE: | 32 | case DMA_FROM_DEVICE: |