* grub-core/lib/relocator.c (malloc_in_range): Trim too verbose

	debug messages.
	(grub_relocator_prepare_relocs): Set movers_chunk.srcv.

diff --git a/ChangeLog b/ChangeLog
index bd8b33b5344b6bb1be8a186dcd729befa4215fbc..63c6e83ee13d6dc89cad58a9e27b53076e111213 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/relocator.c (malloc_in_range): Trim too verbose
+       debug messages.
+       (grub_relocator_prepare_relocs): Set movers_chunk.srcv.
+
 2010-09-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/bsd.c (grub_cmd_netbsd): Provide default serial

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index 9a69413328b09c87d82c6bbe1557a9176bf01453..a0cab55af227bca361fe90c60455a75bd2e90a2b 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -586,8 +586,6 @@ malloc_in_range (struct grub_relocator *rel,
        continue;
       do 
        {
-         grub_dprintf ("relocator", "free block %p+0x%lx\n",
-                       p, (unsigned long) p->size);
          if (p->magic != GRUB_MM_FREE_MAGIC)
            grub_fatal (__FILE__":%d free magic broken at %p (0x%x)\n",
                        __LINE__, p, p->magic);
@@ -1504,7 +1502,8 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
                        grub_relocator_align,
                        rel->relocators_size, &movers_chunk, 1, 1))
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
-  rels = rels0 = grub_map_memory (movers_chunk.src, movers_chunk.size);
+  movers_chunk.srcv = rels = rels0
+    = grub_map_memory (movers_chunk.src, movers_chunk.size);
 
   if (relsize)
     *relsize = rel->relocators_size;