[or-cvs] r14074: backport: And use 16k pages on ia64. (in tor/branches/tor-0_2_0-patches: . src/common)

[weasel at seul.org]

Author: weasel
Date: 2008-03-17 05:46:32 -0400 (Mon, 17 Mar 2008)
New Revision: 14074

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/common/OpenBSD_malloc_Linux.c
Log:
backport: And use 16k pages on ia64.


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 09:46:18 UTC (rev 14073)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 09:46:32 UTC (rev 14074)
@@ -32,7 +32,8 @@
       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

Modified: tor/branches/tor-0_2_0-patches/src/common/OpenBSD_malloc_Linux.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/common/OpenBSD_malloc_Linux.c	2008-03-17 09:46:18 UTC (rev 14073)
+++ tor/branches/tor-0_2_0-patches/src/common/OpenBSD_malloc_Linux.c	2008-03-17 09:46:32 UTC (rev 14074)
@@ -97,7 +97,10 @@
 
 #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)