Skip to content

Commit

Permalink
Bug 1091515 - Don't set 64KB page size on aarch64. r=glandium
Browse files Browse the repository at this point in the history
Linux/aarch64 supports vairous page size configuration.

(From https://www.kernel.org/doc/Documentation/arm64/memory.txt)
- 4KB + 3 levels
- 4KB + 4 levels
- 64KB + 2 leves

So we shouldn't set fixed 64KB page size on aarch64.


MozReview-Commit-ID: 8IdwBMUW4me
  • Loading branch information
makotokato committed Apr 5, 2016
1 parent 6a29e75 commit e2fce8f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions memory/mozjemalloc/jemalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ static const bool config_recycle = false;
* controlling the malloc behavior are defined as compile-time constants
* for best performance and cannot be altered at runtime.
*/
#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__)
#define MALLOC_STATIC_SIZES 1
#endif

Expand All @@ -1104,7 +1104,7 @@ static const bool config_recycle = false;
#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
(defined(__sparc) || defined(__sparcv9) || defined(__ia64))
#define pagesize_2pow ((size_t) 13)
#elif defined(__powerpc64__) || defined(__aarch64__)
#elif defined(__powerpc64__)
#define pagesize_2pow ((size_t) 16)
#else
#define pagesize_2pow ((size_t) 12)
Expand Down

0 comments on commit e2fce8f

Please sign in to comment.