Merge "Remove references to obsolete pmem functionality."
This commit is contained in:
commit
f2f74ca65f
@ -31,11 +31,6 @@
|
|||||||
|
|
||||||
#include <binder/MemoryHeapBase.h>
|
#include <binder/MemoryHeapBase.h>
|
||||||
|
|
||||||
#ifdef HAVE_ANDROID_OS
|
|
||||||
#include <linux/android_pmem.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace android {
|
namespace android {
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@ -108,18 +103,9 @@ status_t MemoryHeapBase::mapfd(int fd, size_t size, uint32_t offset)
|
|||||||
{
|
{
|
||||||
if (size == 0) {
|
if (size == 0) {
|
||||||
// try to figure out the size automatically
|
// 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;
|
struct stat sb;
|
||||||
if (fstat(fd, &sb) == 0)
|
if (fstat(fd, &sb) == 0)
|
||||||
size = sb.st_size;
|
size = sb.st_size;
|
||||||
}
|
|
||||||
// if it didn't work, let mmap() fail.
|
// if it didn't work, let mmap() fail.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user