commit d79b994c71baa12e3859229296b80adbd29abe23
author Elliott Hughes <enh@google.com> Thu Nov 21 12:22:39 2013 -0800
committer Elliott Hughes <enh@google.com> Thu Nov 21 12:22:39 2013 -0800
tree eda6ec9b67ef23f5b411b5ef632dc78ba279ef38
parent 17d6c560ed2c449a4983f17b0e85723e0489f87b

Remove references to obsolete pmem functionality.

Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea

MemoryHeapBase.cpp

diff --git a/MemoryHeapBase.cpp b/MemoryHeapBase.cpp
index d1cbf1c..43a01e4 100644
--- a/MemoryHeapBase.cpp
+++ b/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 @@
 {
     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.
     }