diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-21 20:42:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-21 20:42:33 +0000 |
| commit | f2f74ca65f34ae0cae6f0cca40f1c18aa771739d (patch) | |
| tree | ce30c9c4d7f9dc37baf73f6f072a870d51bdd5ad | |
| parent | 51b27e823373f1cfc709f20d0d704a7d4e558894 (diff) | |
| parent | a5a13a3ecf72554120ce5e856d514b72b70f5cf1 (diff) | |
| download | frameworks_native-f2f74ca65f34ae0cae6f0cca40f1c18aa771739d.zip frameworks_native-f2f74ca65f34ae0cae6f0cca40f1c18aa771739d.tar.gz frameworks_native-f2f74ca65f34ae0cae6f0cca40f1c18aa771739d.tar.bz2 | |
Merge "Remove references to obsolete pmem functionality."
| -rw-r--r-- | libs/binder/MemoryHeapBase.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp index d1cbf1c..43a01e4 100644 --- a/libs/binder/MemoryHeapBase.cpp +++ b/libs/binder/MemoryHeapBase.cpp @@ -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, ®); - 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. } |