[CRIU] [PATCH] aarch64: Fix write_intraprocedure_branch types

[Christopher Covington]

In the recent VDSO code reunification, some types were changed but
a pair of necessary corresponding changes was omitted. Fix that so
the AArch64 build succeeds without type-related
warnings-turned-errors. Also move the definition to the
AArch64-specific header since it's not currently being used by any
other architectures.

Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
 arch/aarch64/include/asm/vdso.h | 1 +
 include/parasite-vdso.h         | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/aarch64/include/asm/vdso.h b/arch/aarch64/include/asm/vdso.h
index 920cebd..d015c63 100644
--- a/arch/aarch64/include/asm/vdso.h
+++ b/arch/aarch64/include/asm/vdso.h
@@ -21,5 +21,6 @@ extern int vdso_redirect_calls(unsigned long base_to,
 			       unsigned long base_from,
 			       struct vdso_symtable *to,
 			       struct vdso_symtable *from);
+extern void write_intraprocedure_branch(unsigned long to, unsigned long from);
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/include/parasite-vdso.h b/include/parasite-vdso.h
index 15e750d..d4dc89b 100644
--- a/include/parasite-vdso.h
+++ b/include/parasite-vdso.h
@@ -85,9 +85,6 @@ extern int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
 			unsigned long vdso_rt_parked_at, size_t index,
 			VmaEntry *vmas, size_t nr_vmas);
 
-/* only used by aarch64 => to be moved to aarch64/include/asm/vdso.h */
-extern void write_intraprocedure_branch(void *to, void *from);
-
 #else /* CONFIG_VDSO */
 #define vdso_do_park(sym_rt, park_at, park_size)		(0)
 
-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project