Use ppc_md.hpte_insert() in htab_bolt_mapping()
PATCH 2/2 Use ppc_md.hpte_insert() in htab_bolt_mapping()
With the ppc_md htab pointers setup earlier, we can use ppc_md.hpte_insert in htab_bolt_mapping(), rather than deciding which version to call by hand.
Signed-off-by Michael Ellerman <[email protected]>
---
arch/powerpc/mm/hash_utils_64.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-)
arch/powerpc/mm/hash_utils_64.c +6 -28
@@ -167,34 +167,12 @@ int htab_bolt_mapping(unsigned long vsta hash =hpt_hash (va, shift); hpteg = ((hash & htab_hash_mask) *HPTES_PER_GROUP ); -/* The crap below can be cleaned once ppd_md.probe() can -* set up the hash callbacks, thus we can just used the -* normal insert callback here. -*/ -#ifdef CONFIG_PPC_ISERIES -if (machine_is (iseries)) - ret =iSeries_hpte_insert (hpteg, va, - paddr, - tmp_mode, -HPTE_V_BOLTED , - psize); - else -#endif -#ifdef CONFIG_PPC_PSERIES -if (machine_is (pseries) &&firmware_has_feature (FW_FEATURE_LPAR )) - ret =pSeries_lpar_hpte_insert (hpteg, va, - paddr, - tmp_mode, -HPTE_V_BOLTED , - psize); - else -#endif -#ifdef CONFIG_PPC_MULTIPLATFORM - ret =native_hpte_insert (hpteg, va, - paddr, - tmp_mode,HPTE_V_BOLTED , - psize); -#endif +DBG ("htab_bolt_mapping: calling %p\n" , ppc_md.hpte_insert); + +BUG_ON (!ppc_md.hpte_insert); + ret = ppc_md.hpte_insert (hpteg, va, paddr, + tmp_mode,HPTE_V_BOLTED , psize); +if (ret <0 )break ; }