testing

aguicode · May 9, 2014 · 030db3d · 030db3d
1 parent deb8940
commit 030db3d
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/util/arena.cc b/util/arena.cc
@@ -76,21 +76,16 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size,
   assert((kAlignUnit & (kAlignUnit - 1)) ==
          0);  // Pointer size should be a power of 2
 
-#ifdef OS_LINUX
+#ifdef MAP_HUGETLB
   if (huge_page_tlb_size > 0 && bytes > 0) {
     // Allocate from a huge page TBL table.
     assert(logger != nullptr);  // logger need to be passed in.
     size_t reserved_size =
         ((bytes - 1U) / huge_page_tlb_size + 1U) * huge_page_tlb_size;
     assert(reserved_size >= bytes);
 
-#ifdef MAP_HUGETLB
     void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
                        (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0);
-#else
-    void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
-                      (MAP_PRIVATE | MAP_ANONYMOUS), 0, 0);
-#endif
 
     if (addr == MAP_FAILED) {
       Warn(logger, "AllocateAligned fail to allocate huge TLB pages: %s",