Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-01 02:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge "arm64: dma-mapping: swap arguments to __get_dma_pgprot"

Browse source
This commit is contained in:
Linux Build Service Account 2014-12-07 09:17:42 -08:00 committed by Gerrit - the friendly Code Review server
commit ed9a8f4dd2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm64/mm/dma-mapping.c
View file

@ -254,7 +254,7 @@ static void arm64_swiotlb_free_coherent(struct device *dev, size_t size,
}
}
static pgprot_t __get_dma_pgprot(pgprot_t prot, struct dma_attrs *attrs)
static pgprot_t __get_dma_pgprot(struct dma_attrs *attrs, pgprot_t prot)
{
if (dma_get_attr(DMA_ATTR_WRITE_COMBINE, attrs))
prot = pgprot_writecombine(prot);
@ -274,7 +274,7 @@ static void *arm64_swiotlb_alloc_noncoherent(struct device *dev, size_t size,
struct page *page, **map;
void *ptr, *coherent_ptr;
int order, i;
pgprot_t prot = __get_dma_pgprot(pgprot_default, attrs);
pgprot_t prot = __get_dma_pgprot(attrs, pgprot_default);
size = PAGE_ALIGN(size);
order = get_order(size);
@ -441,7 +441,7 @@ int arm64_swiotlb_mmap(struct device *dev, struct vm_area_struct *vma,
unsigned long pfn = dma_to_phys(dev, dma_addr) >> PAGE_SHIFT;
unsigned long off = vma->vm_pgoff;
vma->vm_page_prot = __get_dma_pgprot(vma->vm_page_prot, attrs);
vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot);
if (dma_mmap_from_coherent(dev, vma, cpu_addr, size, &ret))
return ret;
@ -461,7 +461,7 @@ static void *arm64_dma_remap(struct device *dev, void *cpu_addr,
struct dma_attrs *attrs)
{
struct page *page = phys_to_page(dma_to_phys(dev, handle));
pgprot_t prot = __get_dma_pgprot(PAGE_KERNEL, attrs);
pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
unsigned long offset = handle & ~PAGE_MASK;
struct vm_struct *area;
unsigned long addr;