commit 846f1deacb1ab2b86407db363ea3252dd0642d65
author Narayan Kamath <narayan@google.com> Sat Feb 21 09:51:18 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 21 09:51:18 2015 +0000
tree 939fa08153802f57e50ce74f6f3b3b390755ab7e
parent 5b73f7ef5dfbeb8aa8311f8c0115f888639b93b8
parent e5e976fe81518f422ddda03bc573d7ffc7c639ae

Merge "Remove loghack.h."

libutils/FileMap.cpp

diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp
index f49b4f9..0af066f 100644
--- a/libutils/FileMap.cpp
+++ b/libutils/FileMap.cpp
@@ -141,20 +141,14 @@
 
     // init on first use
     if (mPageSize == -1) {
-#if NOT_USING_KLIBC
         mPageSize = sysconf(_SC_PAGESIZE);
         if (mPageSize == -1) {
             ALOGE("could not get _SC_PAGESIZE\n");
             return false;
         }
-#else
-        // this holds for Linux, Darwin, Cygwin, and doesn't pain the ARM
-        mPageSize = 4096;
-#endif
     }
 
-    adjust   = offset % mPageSize;
-try_again:
+    adjust = offset % mPageSize;
     adjOffset = offset - adjust;
     adjLength = length + adjust;
 
@@ -165,13 +159,6 @@
 
     ptr = mmap(NULL, adjLength, prot, flags, fd, adjOffset);
     if (ptr == MAP_FAILED) {
-        // Cygwin does not seem to like file mapping files from an offset.
-        // So if we fail, try again with offset zero
-        if (adjOffset > 0) {
-            adjust = offset;
-            goto try_again;
-        }
-
         ALOGE("mmap(%lld,%zu) failed: %s\n",
             (long long)adjOffset, adjLength, strerror(errno));
         return false;