| Message ID | 8af4b329-f362-4f5b-a4bc-59ccc5553fba@HUB2.rwth-ad.de |
|---|---|
| State | New |
| Headers | show |
On 2 September 2015 at 02:38, Stefan Brüns <stefan.bruens@rwth-aachen.de> wrote: > Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> By the way, for future submissions of patch series with more than one patch in them, please can you include a cover letter? (ie what git produces for git format-patch --cover-letter). Some of our tooling for processing patches doesn't really handle multipatch series which don't have a cover letter. thanks -- PMM
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 9c999ac..e44f989 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1447,7 +1447,6 @@ static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, for (i = 0 ; i < MAX_ARG_PAGES ; i++) { if (bprm->page[i]) { - info->rss++; /* FIXME - check return value of memcpy_to_target() for failure */ memcpy_to_target(stack_base, bprm->page[i], TARGET_PAGE_SIZE); g_free(bprm->page[i]); @@ -2198,8 +2197,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) char *elf_interpreter = NULL; info->start_mmap = (abi_ulong)ELF_START_MMAP; - info->mmap = 0; - info->rss = 0; load_elf_image(bprm->filename, bprm->fd, info, &elf_interpreter, bprm->buf); diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 8012cc2..7d0009e 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -36,8 +36,6 @@ struct image_info { abi_ulong start_brk; abi_ulong brk; abi_ulong start_mmap; - abi_ulong mmap; - abi_ulong rss; abi_ulong start_stack; abi_ulong stack_limit; abi_ulong entry;
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> --- linux-user/elfload.c | 3 --- linux-user/qemu.h | 2 -- 2 files changed, 5 deletions(-)