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/linuxload.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/linuxload.c')
| -rw-r--r-- | linux-user/linuxload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index a1fe5ed..f2997c2 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -154,13 +154,13 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp, && bprm->buf[1] == 'E' && bprm->buf[2] == 'L' && bprm->buf[3] == 'F') { - retval = load_elf_binary(bprm, regs, infop); + retval = load_elf_binary(bprm, infop); #if defined(TARGET_HAS_BFLT) } else if (bprm->buf[0] == 'b' && bprm->buf[1] == 'F' && bprm->buf[2] == 'L' && bprm->buf[3] == 'T') { - retval = load_flt_binary(bprm,regs,infop); + retval = load_flt_binary(bprm, infop); #endif } else { return -ENOEXEC; |
