Merge with /shiny/git/linux-2.6/.git

1 files changed, 8 insertions, 10 deletions

diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c
index 077c82fc9f3a..a649edbb23b6 100644
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
@@ -503,7 +503,7 @@ static void __init build_iSeries_Memory_Map(void)
 
         /* Fill in the hashed page table hash mask */
         num_ptegs = hptSizePages *
-                (PAGE_SIZE / (sizeof(HPTE) * HPTES_PER_GROUP));
+                (PAGE_SIZE / (sizeof(hpte_t) * HPTES_PER_GROUP));
         htab_hash_mask = num_ptegs - 1;
 
         /*
@@ -618,25 +618,23 @@ static void __init setup_iSeries_cache_sizes(void)
 static void iSeries_make_pte(unsigned long va, unsigned long pa,
                              int mode)
 {
-        HPTE local_hpte, rhpte;
+        hpte_t local_hpte, rhpte;
         unsigned long hash, vpn;
         long slot;
 
         vpn = va >> PAGE_SHIFT;
         hash = hpt_hash(vpn, 0);
 
-        local_hpte.dw1.dword1 = pa | mode;
-        local_hpte.dw0.dword0 = 0;
-        local_hpte.dw0.dw0.avpn = va >> 23;
-        local_hpte.dw0.dw0.bolted = 1;          /* bolted */
-        local_hpte.dw0.dw0.v = 1;
+        local_hpte.r = pa | mode;
+        local_hpte.v = ((va >> 23) << HPTE_V_AVPN_SHIFT)
+                | HPTE_V_BOLTED | HPTE_V_VALID;
 
         slot = HvCallHpt_findValid(&rhpte, vpn);
         if (slot < 0) {
                 /* Must find space in primary group */
                 panic("hash_page: hpte already exists\n");
         }
-        HvCallHpt_addValidate(slot, 0, (HPTE *)&local_hpte );
+        HvCallHpt_addValidate(slot, 0, &local_hpte);
 }
 
 /*
@@ -646,7 +644,7 @@ static void __init iSeries_bolt_kernel(unsigned long saddr, unsigned long eaddr)
 {
         unsigned long pa;
         unsigned long mode_rw = _PAGE_ACCESSED | _PAGE_COHERENT | PP_RWXX;
-        HPTE hpte;
+        hpte_t hpte;
 
         for (pa = saddr; pa < eaddr ;pa += PAGE_SIZE) {
                 unsigned long ea = (unsigned long)__va(pa);
@@ -659,7 +657,7 @@ static void __init iSeries_bolt_kernel(unsigned long saddr, unsigned long eaddr)
                 if (!in_kernel_text(ea))
                         mode_rw |= HW_NO_EXEC;
 
-                if (hpte.dw0.dw0.v) {
+                if (hpte.v & HPTE_V_VALID) {
                         /* HPTE exists, so just bolt it */
                         HvCallHpt_setSwBits(slot, 0x10, 0);
                         /* And make sure the pp bits are correct */