Merge "Fix return type of process_madvise()." am: 99d11ebe83

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1666519

Change-Id: I7fc2ad42c5f5fec3612d398c005175f511499099
This commit is contained in:
Treehugger Robot 2021-04-07 03:07:15 +00:00 committed by Automerger Merge Worker
commit ddfde66d65
2 changed files with 3 additions and 3 deletions

View file

@ -113,7 +113,7 @@ void* __mremap:mremap(void*, size_t, size_t, int, void*) all
int msync(const void*, size_t, int) all
int mprotect(const void*, size_t, int) all
int madvise(void*, size_t, int) all
int process_madvise(int, const struct iovec*, size_t, int, unsigned int) all
ssize_t process_madvise(int, const struct iovec*, size_t, int, unsigned int) all
int mlock(const void* addr, size_t len) all
int mlock2(const void* addr, size_t len, int flags) all
int munlock(const void* addr, size_t len) all

View file

@ -167,9 +167,9 @@ int madvise(void* __addr, size_t __size, int __advice);
* works just like madvise(2) but applies to the process specified by the given
* PID file descriptor.
*
* Returns 0 on success, and returns -1 and sets `errno` on failure.
* Returns the number of bytes advised on success, and returns -1 and sets `errno` on failure.
*/
int process_madvise(int __pid_fd, const struct iovec* __iov, size_t __count, int __advice, unsigned int __flags);
ssize_t process_madvise(int __pid_fd, const struct iovec* __iov, size_t __count, int __advice, unsigned __flags);
#if defined(__USE_GNU)