diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2021-10-26 15:04:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-26 15:04:11 +0000 |
| commit | fa06aa6de211d34b92cca3285f65f9ab251ff115 (patch) | |
| tree | db5e37c6a26aef2759fe3a64e295ae4ddfd75606 | |
| parent | 08d898a611e7de8dbdb3bd8d7513e61d57951efe (diff) | |
| parent | 9a663b58f35c34b126eef9a00f804fd6f468989b (diff) | |
Merge changes from topic "am-e37d4864-50de-4ca8-8c81-ac05f0f5f4c0" into t-keystone-qcom-dev
* changes:
[automerger] ADSPRPC: Pass 64 bit va buffer to remote_mmap64 from remote_mmap am: 5441a5be1a am: 4300c3a42a
[automerger] ADSPRPC: Pass 64 bit va buffer to remote_mmap64 from remote_mmap am: 5441a5be1a
ADSPRPC: Pass 64 bit va buffer to remote_mmap64 from remote_mmap
| -rw-r--r-- | src/fastrpc_apps_user.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fastrpc_apps_user.c b/src/fastrpc_apps_user.c index 1dbc58e..867702d 100644 --- a/src/fastrpc_apps_user.c +++ b/src/fastrpc_apps_user.c @@ -1250,7 +1250,12 @@ bail: } int remote_mmap(int fd, uint32_t flags, uint32_t vaddrin, int size, uint32_t* vaddrout) { - return remote_mmap64(fd, flags, (uintptr_t)vaddrin, (int64_t)size, (uint64_t*)vaddrout); + uint64_t vaddrout_64; + int nErr = 0; + + nErr = remote_mmap64(fd, flags, (uintptr_t)vaddrin, (int64_t)size, &vaddrout_64); + *vaddrout = (uint32_t)vaddrout_64; + return nErr; } int remote_munmap64(uint64_t vaddrout, int64_t size) { |