[CRIU] [PATCH] pie: piegen -- Make different names for parasite and restorer relocs

[Cyrill Gorcunov]

Otherwise it's confusing since.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 cr-restore.c       | 2 +-
 parasite-syscall.c | 2 +-
 pie/Makefile       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-restore.c b/cr-restore.c
index fbf80024da01..977eb04e3e09 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -2391,7 +2391,7 @@ static int remap_restorer_blob(void *addr)
 	}
 
 	elf_relocs_apply(addr, addr, sizeof(restorer_blob),
-			 elf_relocs, ARRAY_SIZE(elf_relocs));
+			 restorer_relocs, ARRAY_SIZE(restorer_relocs));
 
 	return 0;
 }
diff --git a/parasite-syscall.c b/parasite-syscall.c
index d6e9ce069c92..5ba60078adc4 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -1219,7 +1219,7 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 	memcpy(ctl->local_map, parasite_blob, sizeof(parasite_blob));
 
 	elf_relocs_apply(ctl->local_map, ctl->remote_map, sizeof(parasite_blob),
-			 elf_relocs, ARRAY_SIZE(elf_relocs));
+			 parasite_relocs, ARRAY_SIZE(parasite_relocs));
 
 	/* Setup the rest of a control block */
 	ctl->parasite_ip	= (unsigned long)parasite_sym(ctl->remote_map, __export_parasite_head_start);
diff --git a/pie/Makefile b/pie/Makefile
index efafa361dc7f..f43746f38b71 100644
--- a/pie/Makefile
+++ b/pie/Makefile
@@ -87,7 +87,7 @@ $(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/$(PIELDS)
 
 $(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(obj)/$(PIELDS) pie/piegen
 	$(E) "  GEN     " $@
-	$(Q) pie/piegen/piegen -f $< -p $(call target-name,$@)_blob_offset__ -s $(call target-name,$@)_blob -o $@ $(piegen_stdout)
+	$(Q) pie/piegen/piegen -f $< -v $(call target-name,$@)_relocs -p $(call target-name,$@)_blob_offset__ -s $(call target-name,$@)_blob -o $@ $(piegen_stdout)
 
 else
 
-- 
2.4.2