diff options
author | Peter Palfrader <peter@palfrader.org> | 2008-03-17 09:46:18 +0000 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2008-03-17 09:46:18 +0000 |
commit | 0cccf7375b6ced5a27df4ff04ee4c80eb20abef4 (patch) | |
tree | 9ca64d001f8dec501c0cd45d4878ec1320e3d41f | |
parent | 2ed4b818cb13c88ea2c640682b878f3b1c841591 (diff) | |
download | tor-0cccf7375b6ced5a27df4ff04ee4c80eb20abef4.tar.gz tor-0cccf7375b6ced5a27df4ff04ee4c80eb20abef4.zip |
And use 16k pages on ia64. Maybe this should be a configure thing
svn:r14073
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/common/OpenBSD_malloc_Linux.c | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -24,8 +24,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? - Use proper log levels in the testsuite call of 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. Bugfix on - 0.2.0.x. + - Make the openbsd malloc code use 8k pages on alpha CPUs and 16k pages + on ia64. Bugfix on 0.2.0.x. - Detect mismatched page sizes when using --enable-openbsd-malloc. Bugfix on 0.2.0.x. - Stop giving double-close warn when we reject an address for client DNS. diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 7252ead784..0a8523cc36 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -98,7 +98,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) |