diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-07 03:07:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-07 03:07:15 +0000 |
| commit | ddfde66d65e019f6968bc6373811076d08393dba (patch) | |
| tree | 9ae9b5f3445f5138a3c68576f79875ee00ea90b6 | |
| parent | d8b7066e6507207b11bc58e59a9b837f421a5123 (diff) | |
| parent | 99d11ebe83b38837990bb485247d80a5d8659f10 (diff) | |
| download | bionic-ddfde66d65e019f6968bc6373811076d08393dba.tar.gz | |
Merge "Fix return type of process_madvise()." am: 99d11ebe83
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1666519
Change-Id: I7fc2ad42c5f5fec3612d398c005175f511499099
| -rw-r--r-- | libc/SYSCALLS.TXT | 2 | ||||
| -rw-r--r-- | libc/include/sys/mman.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index d2635089d..ec3482836 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -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 diff --git a/libc/include/sys/mman.h b/libc/include/sys/mman.h index 3b44dab96..6ef0c1214 100644 --- a/libc/include/sys/mman.h +++ b/libc/include/sys/mman.h @@ -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) |