Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c060d9e0 authored by Dima Zavin's avatar Dima Zavin Committed by Android Git Automerger
Browse files

am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap 

Merge commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4' into eclair-mr2

* commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4':
  libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
parents 230efca9 d7f53e19

libs/binder/MemoryHeapPmem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ MemoryHeapPmem::MemoryHeapPmem(const sp<MemoryHeapBase>& pmemHeap, 
    char const * const device = pmemHeap->getDevice();

#if HAVE_ANDROID_OS

    if (device) {

        int fd = open(device, O_RDWR);

        int fd = open(device, O_RDWR | (flags & NO_CACHING ? O_SYNC : 0));

        LOGE_IF(fd<0, "couldn't open %s (%s)", device, strerror(errno));

        if (fd >= 0) {

            int err = ioctl(fd, PMEM_CONNECT, pmemHeap->heapID());