From: Olof Johansson <olof@lixom.net>
Date: Wed, 9 May 2012 09:31:01 +0000 (-0700)
Subject: Merge tag 'v3.4-rc6' into next/cleanup
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5a2a1ba838f60d92bf67c5eef533e95453752cb;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'v3.4-rc6' into next/cleanup

Linux 3.4-rc6

Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

d5a2a1ba838f60d92bf67c5eef533e95453752cb
diff --cc arch/arm/plat-omap/dma.c
index 612227efe34f,c58d896cd5c3..987e6101267d
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@@ -974,9 -972,16 +981,16 @@@ void omap_stop_dma(int lch
  		p->dma_write(l, CCR, lch);
  	}
  
+ 	/*
+ 	 * Ensure that data transferred by DMA is visible to any access
+ 	 * after DMA has been disabled.  This is important for coherent
+ 	 * DMA regions.
+ 	 */
+ 	mb();
+ 
  	if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) {
  		int next_lch, cur_lch = lch;
 -		char dma_chan_link_map[dma_lch_count];
 +		char dma_chan_link_map[MAX_LOGICAL_DMA_CH_COUNT];
  
  		memset(dma_chan_link_map, 0, sizeof(dma_chan_link_map));
  		do {