Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

1 files changed, 2 insertions, 13 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index d4025b9c7..b824b4775 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -34,17 +34,6 @@
 # include <malloc.h> /* for mallopt */
 #endif
 
-/* Try to pull in PAGE_SIZE */
-#ifdef __linux__
-# include <sys/user.h>
-#endif
-#ifdef __GNU__ /* Hurd */
-# include <mach/vm_param.h>
-#endif
-#ifndef PAGE_SIZE
-# define PAGE_SIZE (4*1024) /* guess */
-#endif
-
 
 /* Declare <applet>_main() */
 #define PROTOTYPES
@@ -788,13 +777,13 @@ int main(int argc UNUSED_PARAM, char **argv)
          * to keep before releasing to the OS
          * Default is way too big: 256k
          */
-        mallopt(M_TRIM_THRESHOLD, 2 * PAGE_SIZE);
+        mallopt(M_TRIM_THRESHOLD, 8 * 1024);
 #endif
 #ifdef M_MMAP_THRESHOLD
         /* M_MMAP_THRESHOLD is the request size threshold for using mmap()
          * Default is too big: 256k
          */
-        mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256);
+        mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256);
 #endif
 
 #if !BB_MMU