From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 21 Feb 2019 12:15:10 +0000 (+1100)
Subject: Merge branch 'topic/dma' into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0055df0c9c1471c389197a69f43e300185a75aa;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'topic/dma' into next

Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
---

d0055df0c9c1471c389197a69f43e300185a75aa
diff --cc arch/powerpc/mm/mem.c
index 81f251fc4169,a10ee3645a6c..f6787f90e158
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@@ -76,10 -75,13 +75,8 @@@ static inline pte_t *virt_to_kpte(unsig
  	return pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr),
  			vaddr), vaddr), vaddr);
  }
- #else
- #define TOP_ZONE ZONE_NORMAL
  #endif
  
 -int page_is_ram(unsigned long pfn)
 -{
 -	return memblock_is_memory(__pfn_to_phys(pfn));
 -}
 -
  pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
  			      unsigned long size, pgprot_t vma_prot)
  {