diff --git a/ChangeLog b/ChangeLog index 0222da52f2..14d4f6b0c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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)