[PATCH] ppc64: kill bitfields in ppc64 hash code

This patch removes the use of bitfield types from the ppc64 hash table
manipulation code.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S
index c23d46956dd9..fbff24827ae7 100644
--- a/arch/ppc64/mm/hash_low.S
+++ b/arch/ppc64/mm/hash_low.S
@@ -170,9 +170,7 @@ htab_insert_pte:
         /* Call ppc_md.hpte_insert */
         ld      r7,STK_PARM(r4)(r1)     /* Retreive new pp bits */
         mr      r4,r29                  /* Retreive va */
-        li      r6,0                    /* primary slot */
-        li      r8,0                    /* not bolted and not large */
-        li      r9,0
+        li      r6,0                    /* no vflags */
 _GLOBAL(htab_call_hpte_insert1)
         bl      .                       /* Will be patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -192,9 +190,7 @@ _GLOBAL(htab_call_hpte_insert1)
         /* Call ppc_md.hpte_insert */
         ld      r7,STK_PARM(r4)(r1)     /* Retreive new pp bits */
         mr      r4,r29                  /* Retreive va */
-        li      r6,1                    /* secondary slot */
-        li      r8,0                    /* not bolted and not large */
-        li      r9,0
+        li      r6,HPTE_V_SECONDARY@l   /* secondary slot */
 _GLOBAL(htab_call_hpte_insert2)
         bl      .                       /* Will be patched by htab_finish_init() */
         cmpdi   0,r3,0