ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

Browse Source 
* commit '0d103b596dd9883898a062beaacf980d4439b835':
  Remove references to obsolete pmem functionality.
This commit is contained in:
Elliott Hughes 2013-11-21 23:00:19 -08:00 committed by Android Git Automerger
commit ee47adfb1b
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/binder/MemoryHeapBase.cpp
View File

@ -31,11 +31,6 @@
#include <binder/MemoryHeapBase.h>
#ifdef HAVE_ANDROID_OS
#include <linux/android_pmem.h>
#endif
namespace android {
// ---------------------------------------------------------------------------
@ -108,18 +103,9 @@ status_t MemoryHeapBase::mapfd(int fd, size_t size, uint32_t offset)
{
if (size == 0) {
// try to figure out the size automatically
#ifdef HAVE_ANDROID_OS
// first try the PMEM ioctl
pmem_region reg;
int err = ioctl(fd, PMEM_GET_TOTAL_SIZE, &reg);
if (err == 0)
size = reg.len;
#endif
if (size == 0) { // try fstat
struct stat sb;
if (fstat(fd, &sb) == 0)
size = sb.st_size;
}
struct stat sb;
if (fstat(fd, &sb) == 0)
size = sb.st_size;
// if it didn't work, let mmap() fail.
}