powerpc: Use ppc_function_entry instead of open coding it

Replace FUNCTION_TEXT with ppc_function_entry which can handle both
ABIv1 and ABIv2.

Signed-off-by: Anton Blanchard <anton@samba.org>

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index d766d6ee33fe6889e5a96b3898f8c47b0050fc14..49fc935ee807cf85cfe3854b4216b2ef48ff9b76 100644 (file)
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -603,8 +603,6 @@ int remove_section_mapping(unsigned long start, unsigned long end)
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-#define FUNCTION_TEXT(A)       ((*(unsigned long *)(A)))
-
 static void __init htab_finish_init(void)
 {
        extern unsigned int *htab_call_hpte_insert1;
@@ -619,31 +617,31 @@ static void __init htab_finish_init(void)
        extern unsigned int *ht64_call_hpte_updatepp;
 
        patch_branch(ht64_call_hpte_insert1,
-               FUNCTION_TEXT(ppc_md.hpte_insert),
+               ppc_function_entry(ppc_md.hpte_insert),
                BRANCH_SET_LINK);
        patch_branch(ht64_call_hpte_insert2,
-               FUNCTION_TEXT(ppc_md.hpte_insert),
+               ppc_function_entry(ppc_md.hpte_insert),
                BRANCH_SET_LINK);
        patch_branch(ht64_call_hpte_remove,
-               FUNCTION_TEXT(ppc_md.hpte_remove),
+               ppc_function_entry(ppc_md.hpte_remove),
                BRANCH_SET_LINK);
        patch_branch(ht64_call_hpte_updatepp,
-               FUNCTION_TEXT(ppc_md.hpte_updatepp),
+               ppc_function_entry(ppc_md.hpte_updatepp),
                BRANCH_SET_LINK);
 
 #endif /* CONFIG_PPC_HAS_HASH_64K */
 
        patch_branch(htab_call_hpte_insert1,
-               FUNCTION_TEXT(ppc_md.hpte_insert),
+               ppc_function_entry(ppc_md.hpte_insert),
                BRANCH_SET_LINK);
        patch_branch(htab_call_hpte_insert2,
-               FUNCTION_TEXT(ppc_md.hpte_insert),
+               ppc_function_entry(ppc_md.hpte_insert),
                BRANCH_SET_LINK);
        patch_branch(htab_call_hpte_remove,
-               FUNCTION_TEXT(ppc_md.hpte_remove),
+               ppc_function_entry(ppc_md.hpte_remove),
                BRANCH_SET_LINK);
        patch_branch(htab_call_hpte_updatepp,
-               FUNCTION_TEXT(ppc_md.hpte_updatepp),
+               ppc_function_entry(ppc_md.hpte_updatepp),
                BRANCH_SET_LINK);
 }