1 files changed, 7 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index b4e2c7a038e1..15a7097e5dd7 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -86,7 +86,8 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
         }
 
 
-        lhpte.v = hpte_encode_v(va, MMU_PAGE_4K) | vflags | HPTE_V_VALID;
+        lhpte.v = hpte_encode_v(va, MMU_PAGE_4K, MMU_SEGSIZE_256M) |
+                vflags | HPTE_V_VALID;
         lhpte.r = hpte_encode_r(phys_to_abs(pa), MMU_PAGE_4K) | rflags;
 
         /* Now fill in the actual HPTE */
@@ -142,7 +143,7 @@ static long iSeries_hpte_remove(unsigned long hpte_group)
  *      bits 61..63 : PP2,PP1,PP0
  */
 static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
-                                  unsigned long va, int psize, int local)
+                        unsigned long va, int psize, int ssize, int local)
 {
         struct hash_pte hpte;
         unsigned long want_v;
@@ -150,7 +151,7 @@ static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
         iSeries_hlock(slot);
 
         HvCallHpt_get(&hpte, slot);
-        want_v = hpte_encode_v(va, MMU_PAGE_4K);
+        want_v = hpte_encode_v(va, MMU_PAGE_4K, MMU_SEGSIZE_256M);
 
         if (HPTE_V_COMPARE(hpte.v, want_v) && (hpte.v & HPTE_V_VALID)) {
                 /*
@@ -205,14 +206,14 @@ static long iSeries_hpte_find(unsigned long vpn)
  * No need to lock here because we should be the only user.
  */
 static void iSeries_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
-                                        int psize)
+                                        int psize, int ssize)
 {
         unsigned long vsid,va,vpn;
         long slot;
 
         BUG_ON(psize != MMU_PAGE_4K);
 
-        vsid = get_kernel_vsid(ea);
+        vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         va = (vsid << 28) | (ea & 0x0fffffff);
         vpn = va >> HW_PAGE_SHIFT;
         slot = iSeries_hpte_find(vpn);
@@ -222,7 +223,7 @@ static void iSeries_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
 }
 
 static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va,
-                                    int psize, int local)
+                                    int psize, int ssize, int local)
 {
         unsigned long hpte_v;
         unsigned long avpn = va >> 23;