diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2014-01-10 10:47:30 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2014-01-10 10:47:30 -0800 |
| commit | 205b6b617519d53f17ef2158ff18cb0fe50f5d6c (patch) | |
| tree | 14b89b37faf6aa3ef1b37fb4f6dbdf126d76c799 /linux-user/flatload.c | |
| parent | 1d327fb4c72b898f7500989f3e624b7349581159 (diff) | |
| parent | f0116c5458dc3be398ee7ef8daeaa02ba738bdc1 (diff) | |
| download | hqemu-205b6b617519d53f17ef2158ff18cb0fe50f5d6c.zip hqemu-205b6b617519d53f17ef2158ff18cb0fe50f5d6c.tar.gz | |
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
* riku/linux-user-for-upstream:
linux-user: Remove regs parameter of load_elf_binary and load_flt_binary
linux-user: Support the accept4 socketcall
Message-id: 1389364137-23287-1-git-send-email-riku.voipio@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'linux-user/flatload.c')
| -rw-r--r-- | linux-user/flatload.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-user/flatload.c b/linux-user/flatload.c index ceb89bb..566a7a8 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -704,8 +704,7 @@ static int load_flat_shared_library(int id, struct lib_info *libs) #endif /* CONFIG_BINFMT_SHARED_FLAT */ -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, - struct image_info * info) +int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) { struct lib_info libinfo[MAX_SHARED_LIBS]; abi_ulong p = bprm->p; |
