From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Nov 2013 16:46:15 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d6a38fbf7341268586d2ff08bec08572c3fc71b;p=thirdparty%2Fgrub.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
---

2d6a38fbf7341268586d2ff08bec08572c3fc71b
diff --cc ChangeLog
index 8978c7f46,7f7941601..aee611641
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,10 +1,28 @@@
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* tests/grub_func_test.in: Decrease RAM size to 512M. With less
 +	fragmentation 512M is enough.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/kern/mm.c (grub_real_malloc): Decrease cut-off of moving the
 +	pointer to 32K. This is the size of cache element which is the most
 +	common allocation >1K. This way the pointer is always around blocks
 +	of 32K and so we keep performance while decreasing fragmentation.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/kern/mm.c (grub_real_malloc): Don't update the pointer to
 +	current memory when allocating large chunks. This significantly
 +	decreases memory fragmentation.
 +
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* tests/gzcompress_test.in: Skip if gzip is not installed (unlikely,
+ 	but for symmetry).
+ 	* tests/lzocompress_test.in: Skip if lzop is not installed.
+ 	* tests/xzcompress_test.in: Skip if xz is not installed.
+ 
  2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
  
  	* util/grub-mkrescue.c (main): Fix typo.