powerpc: Fix compile errors with STRICT_MM_TYPECHECKS enabled

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Fix the 32-bit code also]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --cc arch/powerpc/include/asm/kvm_book3s_64.h
Simple merge

diff --cc arch/powerpc/mm/dma-noncoherent.c
Simple merge

diff --cc arch/powerpc/mm/fsl_booke_mmu.c
Simple merge

diff --cc arch/powerpc/mm/hugepage-hash64.c
Simple merge

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_32.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_64.c
Simple merge

diff --cc arch/powerpc/mm/tlb_hash64.c
Simple merge