am e4aaceb3: am 191c7e3e: am 3fdb7355: Merge "Avoid sign extension in 32-bit mmap."

* commit 'e4aaceb302a846cf862d9e8a6d96bf85b07d8123':
  Avoid sign extension in 32-bit mmap.
This commit is contained in:
Elliott Hughes 2013-12-21 02:38:20 +00:00 committed by Android Git Automerger
commit bb6bf6417a

View File

@ -55,5 +55,5 @@ void* mmap64(void* addr, size_t size, int prot, int flags, int fd, off64_t offse
}
void* mmap(void* addr, size_t size, int prot, int flags, int fd, off_t offset) {
return mmap64(addr, size, prot, flags, fd, static_cast<off64_t>(offset));
return mmap64(addr, size, prot, flags, fd, static_cast<off64_t>(offset) & 0xffffffff);
}