[POWERPC] Fix STRICT_MM_TYPECHECKS

Since we don't have it active by default, the STRICT_MM_TYPECHECKS
option has bitrotted again.  This patch fixes a couple of simple build
fixes if the option is selected.  First, pud_t mustn't be defined in
page.h on 32-bit systems, because it conflicts with the version in the
generic pud-folding code.  Second, pci_32.c is missing a __pgprot()
wrapper call.  Third, a couple of PS3 files use constants of type
pgprot_t when they need the raw values, we add pgprot_val() calls to
fix this.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index ea60c451cf87..a1409e450c70 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -273,7 +273,8 @@ void __init ps3_map_htab(void)
 
         result = lv1_map_htab(0, &htab_addr);
 
-        htab = (hpte_t *)__ioremap(htab_addr, htab_size, PAGE_READONLY_X);
+        htab = (hpte_t *)__ioremap(htab_addr, htab_size,
+                                   pgprot_val(PAGE_READONLY_X));
 
         DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,
                 htab_addr, (unsigned long)htab);
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index a397e4e17c13..af8efe3c459a 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -184,7 +184,7 @@ static int __init setup_areas(struct spu *spu)
 
         spu_pdata(spu)->shadow = __ioremap(
                 spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
-                PAGE_READONLY | _PAGE_NO_CACHE | _PAGE_GUARDED);
+                pgprot_val(PAGE_READONLY) | _PAGE_NO_CACHE | _PAGE_GUARDED);
         if (!spu_pdata(spu)->shadow) {
                 pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
                 goto fail_ioremap;