diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-01-30 16:05:18 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-01-30 16:05:18 +0100 |
| commit | ce273db0ff1ae64fea785af25a43977b0b6a4555 (patch) | |
| tree | 1a5d03cb1e5c0d63f298691a980b3e248654619f /drivers/dma | |
| parent | 93fa6cf60aad833e7572a61f98b2d0aa6f67de40 (diff) | |
| parent | 14b4dbafa7e7e13323e402efd7723aafa391d69a (diff) | |
| download | talos-op-linux-ce273db0ff1ae64fea785af25a43977b0b6a4555.tar.gz talos-op-linux-ce273db0ff1ae64fea785af25a43977b0b6a4555.zip | |
Merge branch 'iommu/iommu-priv' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/core
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | 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 740bbb942594..48720800c438 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -1867,9 +1867,10 @@ static int dmac_alloc_resources(struct pl330_dmac *pl330) * Alloc MicroCode buffer for 'chans' Channel threads. * A channel's buffer offset is (Channel_Id * MCODE_BUFF_PERCHAN) */ - pl330->mcode_cpu = dma_alloc_coherent(pl330->ddma.dev, + pl330->mcode_cpu = dma_alloc_attrs(pl330->ddma.dev, chans * pl330->mcbufsz, - &pl330->mcode_bus, GFP_KERNEL); + &pl330->mcode_bus, GFP_KERNEL, + DMA_ATTR_PRIVILEGED); if (!pl330->mcode_cpu) { dev_err(pl330->ddma.dev, "%s:%d Can't allocate memory!\n", __func__, __LINE__); |
