[CRIU] [PATCH 1/3] vdso: remove per-arch declaration for vdso_redirect_calls

[Dmitry Safonov]

It's the same on all archs (as it's called from generic code),
no need to redeclare it. <parasite-vdso.h> is included in all
per-arch headers. Drop vdso_symtable forward declaration as
<parasite-vdso.h> includes <util-vdso.h> header which defines
the structure.

Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/arch/aarch64/include/asm/vdso.h | 6 ------
 criu/arch/ppc64/include/asm/vdso.h   | 6 ------
 criu/arch/x86/include/asm/vdso.h     | 6 ------
 criu/include/parasite-vdso.h         | 2 ++
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/criu/arch/aarch64/include/asm/vdso.h b/criu/arch/aarch64/include/asm/vdso.h
index 26dcf8b8885c..34d723f6c3c3 100644
--- a/criu/arch/aarch64/include/asm/vdso.h
+++ b/criu/arch/aarch64/include/asm/vdso.h
@@ -25,12 +25,6 @@ static const char* __maybe_unused aarch_vdso_symbol4 = "__kernel_rt_sigreturn";
 	aarch_vdso_symbol3,			\
 	aarch_vdso_symbol4
 
-
-struct vdso_symtable;
-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/criu/arch/ppc64/include/asm/vdso.h b/criu/arch/ppc64/include/asm/vdso.h
index ed94e4cf0160..9546e2460cf1 100644
--- a/criu/arch/ppc64/include/asm/vdso.h
+++ b/criu/arch/ppc64/include/asm/vdso.h
@@ -25,10 +25,4 @@
 	"__kernel_sync_dicache_p5",		\
 	"__kernel_time"
 
-struct vdso_symtable;
-extern int vdso_redirect_calls(unsigned long base_to,
-			       unsigned long base_from,
-			       struct vdso_symtable *to,
-			       struct vdso_symtable *from);
-
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/x86/include/asm/vdso.h b/criu/arch/x86/include/asm/vdso.h
index 37296f96af30..d6c2f1b8ca6b 100644
--- a/criu/arch/x86/include/asm/vdso.h
+++ b/criu/arch/x86/include/asm/vdso.h
@@ -24,10 +24,4 @@
 	"__kernel_rt_sigreturn"
 
 
-struct vdso_symtable;
-extern int vdso_redirect_calls(unsigned long base_to,
-			       unsigned long base_from,
-			       struct vdso_symtable *to,
-			       struct vdso_symtable *from);
-
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/include/parasite-vdso.h b/criu/include/parasite-vdso.h
index ae9584512fa4..7d19efd12c22 100644
--- a/criu/include/parasite-vdso.h
+++ b/criu/include/parasite-vdso.h
@@ -85,6 +85,8 @@ extern int vdso_proxify(struct vdso_symtable *sym_rt,
 			unsigned long vdso_rt_parked_at,
 			VmaEntry *vmas, size_t nr_vmas,
 			bool compat_vdso, bool force_trampolines);
+extern int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
+			struct vdso_symtable *to, struct vdso_symtable *from);
 
 #else /* CONFIG_VDSO */
 #define vdso_do_park(sym_rt, park_at, park_size)		(0)
-- 
2.11.1