Merge remote-tracking branch 'agust/next' into next

[linux-2.6-block.git] / arch / powerpc / mm / slb.c

diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index a538c80db2df068da5dac56aa5076f484db434d8..9d1d33cd2be528598eb9a3e0c436a0c041094656 100644 (file)
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -66,8 +66,10 @@ static inline void slb_shadow_update(unsigned long ea, int ssize,
         * we only update the current CPU's SLB shadow buffer.
         */
        get_slb_shadow()->save_area[entry].esid = 0;
-       get_slb_shadow()->save_area[entry].vsid = mk_vsid_data(ea, ssize, flags);
-       get_slb_shadow()->save_area[entry].esid = mk_esid_data(ea, ssize, entry);
+       get_slb_shadow()->save_area[entry].vsid =
+                               cpu_to_be64(mk_vsid_data(ea, ssize, flags));
+       get_slb_shadow()->save_area[entry].esid =
+                               cpu_to_be64(mk_esid_data(ea, ssize, entry));
 }
 
 static inline void slb_shadow_clear(unsigned long entry)
@@ -112,7 +114,8 @@ static void __slb_flush_and_rebolt(void)
        } else {
                /* Update stack entry; others don't change */
                slb_shadow_update(get_paca()->kstack, mmu_kernel_ssize, lflags, 2);
-               ksp_vsid_data = get_slb_shadow()->save_area[2].vsid;
+               ksp_vsid_data =
+                       be64_to_cpu(get_slb_shadow()->save_area[2].vsid);
        }
 
        /* We need to do this all in asm, so we're sure we don't touch