sparc32: fix build with STRICT_MM_TYPECHECKS

Based on recent thread on linux-arch (some weeks ago) I
decided to check how much work was required to build sparc32
with STRICT_MM_TYPECHECKS enabled.

The resulting binary (checked srmmu.o) was to my suprise smaller with
STRICT_MM_TYPECHECKS defined, than without.

As I have no working gear to test sparc32 bits at for the moment,
I did not enable STRICT_MM_TYPECHECKS - but was tempeted to do so.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 5 deletions

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 5cbc96d801ff..3b1c047e7cf0 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -107,7 +107,12 @@ static inline int srmmu_pmd_none(pmd_t pmd)
 
 /* XXX should we hyper_flush_whole_icache here - Anton */
 static inline void srmmu_ctxd_set(ctxd_t *ctxp, pgd_t *pgdp)
-{ set_pte((pte_t *)ctxp, (SRMMU_ET_PTD | (__nocache_pa((unsigned long) pgdp) >> 4))); }
+{
+        pte_t pte;
+
+        pte = __pte((SRMMU_ET_PTD | (__nocache_pa(pgdp) >> 4)));
+        set_pte((pte_t *)ctxp, pte);
+}
 
 void pmd_set(pmd_t *pmdp, pte_t *ptep)
 {
@@ -116,8 +121,8 @@ void pmd_set(pmd_t *pmdp, pte_t *ptep)
 
         ptp = __nocache_pa((unsigned long) ptep) >> 4;
         for (i = 0; i < PTRS_PER_PTE/SRMMU_REAL_PTRS_PER_PTE; i++) {
-                set_pte((pte_t *)&pmdp->pmdv[i], SRMMU_ET_PTD | ptp);
-                ptp += (SRMMU_REAL_PTRS_PER_PTE*sizeof(pte_t) >> 4);
+                set_pte((pte_t *)&pmdp->pmdv[i], __pte(SRMMU_ET_PTD | ptp));
+                ptp += (SRMMU_REAL_PTRS_PER_PTE * sizeof(pte_t) >> 4);
         }
 }
 
@@ -128,8 +133,8 @@ void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *ptep)
 
         ptp = page_to_pfn(ptep) << (PAGE_SHIFT-4);      /* watch for overflow */
         for (i = 0; i < PTRS_PER_PTE/SRMMU_REAL_PTRS_PER_PTE; i++) {
-                set_pte((pte_t *)&pmdp->pmdv[i], SRMMU_ET_PTD | ptp);
-                ptp += (SRMMU_REAL_PTRS_PER_PTE*sizeof(pte_t) >> 4);
+                set_pte((pte_t *)&pmdp->pmdv[i], __pte(SRMMU_ET_PTD | ptp));
+                ptp += (SRMMU_REAL_PTRS_PER_PTE * sizeof(pte_t) >> 4);
         }
 }