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.

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/mm/mem.c
index 81f251fc4169f2cef7879986377c840535613839,a10ee3645a6c8520f50a4d3b45e0a9fac5529a23..f6787f90e1585bb735e38ee85a869e865486f9af
--- 1/arch/powerpc/mm/mem.c
--- 2/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)
  {

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/powernv/npu-dma.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge