diff options
| author | Anthony Liguori | 2013-12-06 21:56:51 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-12-06 21:56:51 +0100 |
| commit | a55d121f4a932dcd19eb8164804cc98d5ea88e72 (patch) | |
| tree | 45527567a6630058b1d4daf05fa738b9280b7945 /linux-user/flatload.c | |
| parent | Merge remote-tracking branch 'kraxel/tags/pull-usb-1' into staging (diff) | |
| parent | linux-user: pass correct parameter to do_shmctl() (diff) | |
| download | qemu-a55d121f4a932dcd19eb8164804cc98d5ea88e72.tar.gz qemu-a55d121f4a932dcd19eb8164804cc98d5ea88e72.tar.xz qemu-a55d121f4a932dcd19eb8164804cc98d5ea88e72.zip | |
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
# By Erik de Castro Lopo (2) and others
# Via Riku Voipio
* riku/linux-user-for-upstream:
linux-user: pass correct parameter to do_shmctl()
linux-user: create target_structs header to place ipc_perm and shmid_ds
flatload: fix non-GOT relocations
linux-user: Implement handling of 5 POSIX timer syscalls.
linux-user: Add target struct defs needed for POSIX timer syscalls.
Message-id: cover.1385732338.git.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 58f679e072..ceb89bb6ea 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -633,7 +633,7 @@ static int load_flat_file(struct linux_binprm * bprm, /* Get the pointer's value. */ if (get_user_ual(addr, rp)) return -EFAULT; - addr = flat_get_addr_from_rp(rp, relval, flags, &persistent); + addr = flat_get_addr_from_rp(addr, relval, flags, &persistent); if (addr != 0) { /* * Do the relocation. PIC relocs in the data section are |