diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-03-17 09:46:32 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-03-17 09:46:32 +0000 |
| commit | 7b3af83389a45808520caeb13d069bd9944e3161 (patch) | |
| tree | 7c7fcd582a77c95ca09ccd68127dc68e8bd429c5 | |
| parent | c33722b5c0399a46e0029dfbce251c16afea35bc (diff) | |
| download | tor-7b3af83389a45808520caeb13d069bd9944e3161.tar.gz tor-7b3af83389a45808520caeb13d069bd9944e3161.zip | |
backport: And use 16k pages on ia64.
svn:r14074
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/common/OpenBSD_malloc_Linux.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -32,7 +32,8 @@ Changes in version 0.2.0.22-rc - 2008-03-17 get_interface_address6(). - When using a nonstandard malloc, do not use the platform values for HAVE_MALLOC_GOOD_SIZE or HAVE_MALLOC_USABLE_SIZE. - - Make the openbsd malloc code use 8k pages on alpha CPUs. + - Make the openbsd malloc code use 8k pages on alpha CPUs and 16k pages + on ia64. - Detect mismatched page sizes when using --enable-openbsd-malloc. - Avoid double-marked-for-close warning when certain kinds of invalid .in-addr.arpa addresses are passed to the DNSPort. Part of a fix diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 7773c70ef0..7114d69455 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -97,7 +97,10 @@ static pthread_mutex_t gen_mutex = PTHREAD_MUTEX_INITIALIZER; #if defined(__sparc__) || defined(__alpha__) #define malloc_pageshift 13U -#endif /* __sparc__ */ +#endif +#if defined(__ia64__) +#define malloc_pageshift 14U +#endif #ifndef malloc_pageshift #define malloc_pageshift (PGSHIFT) |