1 files changed, 22 insertions, 14 deletions

diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index f8a871a72985..88ce7d212320 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -55,7 +55,7 @@ static inline void __tlbie(unsigned long vpn, int psize, int apsize, int ssize)
          * We need 14 to 65 bits of va for a tlibe of 4K page
          * With vpn we ignore the lower VPN_SHIFT bits already.
          * And top two bits are already ignored because we can
-         * only accomadate 76 bits in a 64 bit vpn with a VPN_SHIFT
+         * only accomodate 76 bits in a 64 bit vpn with a VPN_SHIFT
          * of 12.
          */
         va = vpn << VPN_SHIFT;
@@ -64,7 +64,8 @@ static inline void __tlbie(unsigned long vpn, int psize, int apsize, int ssize)
          * Older versions of the architecture (2.02 and earler) require the
          * masking of the top 16 bits.
          */
-        va &= ~(0xffffULL << 48);
+        if (mmu_has_feature(MMU_FTR_TLBIE_CROP_VA))
+                va &= ~(0xffffULL << 48);
 
         switch (psize) {
         case MMU_PAGE_4K:
@@ -113,7 +114,8 @@ static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize)
          * Older versions of the architecture (2.02 and earler) require the
          * masking of the top 16 bits.
          */
-        va &= ~(0xffffULL << 48);
+        if (mmu_has_feature(MMU_FTR_TLBIE_CROP_VA))
+                va &= ~(0xffffULL << 48);
 
         switch (psize) {
         case MMU_PAGE_4K:
@@ -605,7 +607,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
  * crashdump and all bets are off anyway.
  *
  * TODO: add batching support when enabled.  remember, no dynamic memory here,
- * athough there is the control page available...
+ * although there is the control page available...
  */
 static void native_hpte_clear(void)
 {
@@ -723,23 +725,29 @@ static void native_flush_hash_range(unsigned long number, int local)
         local_irq_restore(flags);
 }
 
-static int native_update_partition_table(u64 patb1)
+static int native_register_proc_table(unsigned long base, unsigned long page_size,
+                                      unsigned long table_size)
 {
+        unsigned long patb1 = base << 25; /* VSID */
+
+        patb1 |= (page_size << 5);  /* sllp */
+        patb1 |= table_size;
+
         partition_tb->patb1 = cpu_to_be64(patb1);
         return 0;
 }
 
 void __init hpte_init_native(void)
 {
-        ppc_md.hpte_invalidate  = native_hpte_invalidate;
-        ppc_md.hpte_updatepp    = native_hpte_updatepp;
-        ppc_md.hpte_updateboltedpp = native_hpte_updateboltedpp;
-        ppc_md.hpte_insert      = native_hpte_insert;
-        ppc_md.hpte_remove      = native_hpte_remove;
-        ppc_md.hpte_clear_all   = native_hpte_clear;
-        ppc_md.flush_hash_range = native_flush_hash_range;
-        ppc_md.hugepage_invalidate   = native_hugepage_invalidate;
+        mmu_hash_ops.hpte_invalidate    = native_hpte_invalidate;
+        mmu_hash_ops.hpte_updatepp      = native_hpte_updatepp;
+        mmu_hash_ops.hpte_updateboltedpp = native_hpte_updateboltedpp;
+        mmu_hash_ops.hpte_insert        = native_hpte_insert;
+        mmu_hash_ops.hpte_remove        = native_hpte_remove;
+        mmu_hash_ops.hpte_clear_all     = native_hpte_clear;
+        mmu_hash_ops.flush_hash_range = native_flush_hash_range;
+        mmu_hash_ops.hugepage_invalidate   = native_hugepage_invalidate;
 
         if (cpu_has_feature(CPU_FTR_ARCH_300))
-                ppc_md.update_partition_table = native_update_partition_table;
+                ppc_md.register_process_table = native_register_proc_table;
 }