From 84646ee25b68321624ef4768011e91064e4bd440 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20Br=C3=BCns?= Date: Wed, 2 Sep 2015 03:38:52 +0200 Subject: [PATCH] linux-user: remove unused image_info members MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Peter Maydell Signed-off-by: Stefan Brüns Signed-off-by: Riku Voipio --- linux-user/elfload.c | 3 --- linux-user/qemu.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a7ff58c8bb..ad46530f83 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1455,7 +1455,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]); @@ -2206,8 +2205,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 e8606b290c..678e5d602e 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; -- 2.11.0