powerpc: Get USE_STRICT_MM_TYPECHECKS working again

The typesafe version of the powerpc pagetable handling (with
USE_STRICT_MM_TYPECHECKS defined) has bitrotted again.  This patch
makes a bunch of small fixes to get it back to building status.

It's still not enabled by default as gcc still generates worse
code with it for some reason.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c
index 9fdf4d6335e4..28a114db3ba0 100644
--- a/arch/powerpc/mm/gup.c
+++ b/arch/powerpc/mm/gup.c
@@ -41,7 +41,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,
                 page = pte_page(pte);
                 if (!page_cache_get_speculative(page))
                         return 0;
-                if (unlikely(pte != *ptep)) {
+                if (unlikely(pte_val(pte) != pte_val(*ptep))) {
                         put_page(page);
                         return 0;
                 }
@@ -92,7 +92,7 @@ static noinline int gup_huge_pte(pte_t *ptep, struct hstate *hstate,
                 *nr -= refs;
                 return 0;
         }
-        if (unlikely(pte != *ptep)) {
+        if (unlikely(pte_val(pte) != pte_val(*ptep))) {
                 /* Could be optimized better */
                 while (*nr) {
                         put_page(page);
@@ -237,7 +237,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                         pgd_t pgd = *pgdp;
 
                         VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, addr)].shift);
-                        pr_debug("  %016lx: normal pgd %p\n", addr, (void *)pgd);
+                        pr_debug("  %016lx: normal pgd %p\n", addr,
+                                 (void *)pgd_val(pgd));
                         next = pgd_addr_end(addr, end);
                         if (pgd_none(pgd))
                                 goto slow;