Commit ea0fd2aa authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

pie: piegen -- Make different names for parasite and restorer relocs

Otherwise it's confusing since.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent aa557c96
......@@ -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;
}
......
......@@ -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);
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment