From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vinod.koul@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Javi Merino <javi.merino@arm.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Boojin Kim <boojin.kim@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Fri, 9 Mar 2012 13:25:54 +1100 [thread overview]
Message-ID: <20120309132554.a82c72a8f2dab11c9104a596@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]
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 <sfr@canb.auug.org.au>
Date: Fri, 9 Mar 2012 13:21:55 +1100
Subject: [PATCH] DMA: PL330: update for code movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-09 2:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 2:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-12 5:26 linux-next: manual merge of the slave-dma tree with Linus' tree Stephen Rothwell
2020-03-12 7:16 ` Peter Ujfalusi
2020-03-13 12:42 ` Vinod Koul
2019-06-11 6:32 Stephen Rothwell
2019-06-11 10:08 ` Vinod Koul
2019-02-26 4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-01-23 2:41 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2012-03-27 0:45 Stephen Rothwell
2011-08-26 1:46 Stephen Rothwell
2011-07-27 2:08 Stephen Rothwell
2011-07-27 3:12 ` Koul, Vinod
2011-07-27 16:25 ` Koul, Vinod
2011-07-27 20:19 ` Russell King - ARM Linux
2011-07-27 20:29 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120309132554.a82c72a8f2dab11c9104a596@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=boojin.kim@samsung.com \
--cc=javi.merino@arm.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).