<<<<<<< HEAD
=======
#endif /* MEMPROTECT */

      void *newp = NULL;
      size_t alloc_size = 0;
#ifdef DEBUG
      char *oldsbrk = (char *)sbrk(0), *newsbrk = NULL;
#endif
      if (ats_hugepage_enabled()) {
        alloc_size = INK_ALIGN(f->chunk_size * f->type_size, ats_hugepage_size());
        newp = ats_alloc_hugepage(alloc_size);
      }
>>>>>>> asf/6.0.x

      if (newp == NULL) {
        alloc_size = INK_ALIGN(f->chunk_size * f->type_size, ats_pagesize());
        newp = ats_memalign(ats_pagesize(), alloc_size);
      }
<<<<<<< HEAD

      ats_madvise((caddr_t)newp, alloc_size, f->advice);
=======
      ats_madvise((caddr_t)newp, alloc_size, f->advice);
      fl_memadd(f->chunk_size * type_size);
#ifdef DEBUG
      newsbrk = (char *)sbrk(0);
      ink_atomic_increment(&fastmemtotal, newsbrk - oldsbrk);
/*      printf("fastmem %d, %d, %d\n", f->chunk_size * type_size,
   newsbrk - oldsbrk, fastmemtotal); */
#endif
>>>>>>> asf/6.0.x