linux-next: manual merge of the slave-dma tree with Linus' tree

Hi Vinod,

Today's linux-next merge of the slave-dma tree got conflicts in
arch/arm/include/asm/hardware/pl330.h and arch/arm/common/pl330.c between
commits 4272f98a1ae8 ("ARM: 7164/3: PL330: Fix the size of the
dst_cache_ctrl field") and 46e33c606af8 ("ARM: 7326/2: PL330: fix null
pointer dereference in pl330_chan_ctrl()") from Linus' tree and commit
b7d861d93945 ("DMA: PL330: Merge PL330 driver into drivers/dma/") from
the slave-dma tree.

I removed the files and then applied changes from the patchs in Linus'
tree to drivers/dma/pl330.c.

From: Stephen Rothwell <redacted>
Date: Fri, 9 Mar 2012 13:21:55 +1100
Subject: [PATCH] DMA: PL330: update for code movement

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/dma/pl330.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 7253d17..41ec06d 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c

@@ -48,7 +48,7 @@ enum pl330_dstcachectrl {
 	DCCTRL1,	/* Bufferable only */
 	DCCTRL2,	/* Cacheable, but do not allocate */
 	DCCTRL3,	/* Cacheable and bufferable, but do not allocate */
-	DINVALID1 = 8,
+	DINVALID1,		/* AWCACHE = 0x1000 */
 	DINVALID2,
 	DCCTRL6,	/* Cacheable write-through, allocate on writes only */
 	DCCTRL7,	/* Cacheable write-back, allocate on writes only */

@@ -1799,12 +1799,13 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
 	struct pl330_thread *thrd = ch_id;
 	struct pl330_dmac *pl330;
 	unsigned long flags;
-	int ret = 0, active = thrd->req_running;
+	int ret = 0, active;
 
 	if (!thrd || thrd->free || thrd->dmac->state == DYING)
 		return -EINVAL;
 
 	pl330 = thrd->dmac;
+	active = thrd->req_running;
 
 	spin_lock_irqsave(&pl330->lock, flags);
 

-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au