2 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 7796519fd238..e9e7a6999bb8 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -100,7 +100,7 @@ struct paca_struct {
         /* SLB related definitions */
         u16 vmalloc_sllp;
         u16 slb_cache_ptr;
-        u16 slb_cache[SLB_CACHE_ENTRIES];
+        u32 slb_cache[SLB_CACHE_ENTRIES];
 #endif /* CONFIG_PPC_STD_MMU_64 */
 
 #ifdef CONFIG_PPC_BOOK3E
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index 3b75f19aaa22..f6a262555ef2 100644
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -270,10 +270,10 @@ _GLOBAL(slb_compare_rr_to_size)
         bge     1f
 
         /* still room in the slb cache */
-        sldi    r11,r3,1                /* r11 = offset * sizeof(u16) */
-        rldicl  r10,r10,36,28           /* get low 16 bits of the ESID */
-        add     r11,r11,r13             /* r11 = (u16 *)paca + offset */
-        sth     r10,PACASLBCACHE(r11)   /* paca->slb_cache[offset] = esid */
+        sldi    r11,r3,2                /* r11 = offset * sizeof(u32) */
+        srdi    r10,r10,28              /* get the 36 bits of the ESID */
+        add     r11,r11,r13             /* r11 = (u32 *)paca + offset */
+        stw     r10,PACASLBCACHE(r11)   /* paca->slb_cache[offset] = esid */
         addi    r3,r3,1                 /* offset++ */
         b       2f
 1:                                      /* offset >= SLB_CACHE_ENTRIES */