powerpc/mm: Move hash table ops to a separate structure

Moving probe_machine() to after mmu init will cause the ppc_md
fields relative to the hash table management to be overwritten.

Since we have essentially disconnected the machine type from
the hash backend ops, finish the job by moving them to a different
structure.

The only callback that didn't quite fix is update_partition_table
since this is not specific to hash, so I moved it to a standalone
variable for now. We can revisit later if needed.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
[mpe: Fix ppc64e build failure in kexec]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

2 files changed, 15 insertions, 15 deletions

diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index c9a3e677192a..cb3c50328de8 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -195,12 +195,12 @@ static void ps3_hpte_clear(void)
 
 void __init ps3_hpte_init(unsigned long htab_size)
 {
-        ppc_md.hpte_invalidate = ps3_hpte_invalidate;
-        ppc_md.hpte_updatepp = ps3_hpte_updatepp;
-        ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp;
-        ppc_md.hpte_insert = ps3_hpte_insert;
-        ppc_md.hpte_remove = ps3_hpte_remove;
-        ppc_md.hpte_clear_all = ps3_hpte_clear;
+        mmu_hash_ops.hpte_invalidate = ps3_hpte_invalidate;
+        mmu_hash_ops.hpte_updatepp = ps3_hpte_updatepp;
+        mmu_hash_ops.hpte_updateboltedpp = ps3_hpte_updateboltedpp;
+        mmu_hash_ops.hpte_insert = ps3_hpte_insert;
+        mmu_hash_ops.hpte_remove = ps3_hpte_remove;
+        mmu_hash_ops.hpte_clear_all = ps3_hpte_clear;
 
         ppc64_pft_size = __ilog2(htab_size);
 }
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 03c732afef34..0e91388d0af9 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -591,15 +591,15 @@ __setup("bulk_remove=", disable_bulk_remove);
 
 void __init hpte_init_lpar(void)
 {
-        ppc_md.hpte_invalidate  = pSeries_lpar_hpte_invalidate;
-        ppc_md.hpte_updatepp    = pSeries_lpar_hpte_updatepp;
-        ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
-        ppc_md.hpte_insert      = pSeries_lpar_hpte_insert;
-        ppc_md.hpte_remove      = pSeries_lpar_hpte_remove;
-        ppc_md.hpte_removebolted = pSeries_lpar_hpte_removebolted;
-        ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
-        ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
-        ppc_md.hugepage_invalidate = pSeries_lpar_hugepage_invalidate;
+        mmu_hash_ops.hpte_invalidate     = pSeries_lpar_hpte_invalidate;
+        mmu_hash_ops.hpte_updatepp       = pSeries_lpar_hpte_updatepp;
+        mmu_hash_ops.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
+        mmu_hash_ops.hpte_insert         = pSeries_lpar_hpte_insert;
+        mmu_hash_ops.hpte_remove         = pSeries_lpar_hpte_remove;
+        mmu_hash_ops.hpte_removebolted   = pSeries_lpar_hpte_removebolted;
+        mmu_hash_ops.flush_hash_range    = pSeries_lpar_flush_hash_range;
+        mmu_hash_ops.hpte_clear_all      = pSeries_lpar_hptab_clear;
+        mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate;
 }
 
 #ifdef CONFIG_PPC_SMLPAR