[CRIU] [PATCHv2 4/5] parasite-vdso: vdso_map_compat under CONFIG_COMPAT

Dmitry Safonov dsafonov at virtuozzo.com
Fri Sep 16 11:37:13 PDT 2016


  It's used in restorer to map compatible vDSO blob.
When !CONFIG_COMPAT it's not needed and even more:
vdso_fill_symtable_compat is macro and is undefined in that
case. It will never shoot, as compat_vdso is always false
for that case, but get rid of it.
  I also need to leave CONFIG_X86_64 here, as arch_prctl()
is not defined for x86_32.

Cc: Cyrill Gorcunov <gorcunov at openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/pie/parasite-vdso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index f838f826d24c..af969a150fee 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -69,7 +69,7 @@ int vdso_do_park(struct vdso_symtable *sym_rt, unsigned long park_at, unsigned l
 	return ret;
 }
 
-#ifdef CONFIG_X86_64
+#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
 #ifndef ARCH_MAP_VDSO_32
 # define ARCH_MAP_VDSO_32	0x2002
 #endif
-- 
2.9.0



More information about the CRIU mailing list