* grub-core/lib/relocator.c (allocate_inreg): Avoid dprintf unless

	DEBUG_RELOCATOR is defined since gfxterm can't cope with output when
	malloc is disabled.

diff --git a/ChangeLog b/ChangeLog
index 61adf1e261a24af575f6ed64007eb6aecaa2be51..2cdeb6dc443f29b33e0c511a5e059b96c963e9e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/relocator.c (allocate_inreg): Avoid dprintf unless
+       DEBUG_RELOCATOR is defined since gfxterm can't cope with output when
+       malloc is disabled.
+
 2011-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/bsdXX.c (grub_freebsd_load_elfmodule): Account

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index e1bb7b7eaa37160cf0254e91cd171237869466b7..421054176f500cdaf362857e16487ea3bd1ec14a 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -200,10 +200,12 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
   struct grub_mm_header *foll = NULL;
   grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
 
+#ifdef DEBUG_RELOCATOR
   grub_dprintf ("relocator", "inreg paddr = 0x%lx, size = %lu,"
                " hb = %p, hbp = %p, rb = %p, vaddr = 0x%lx\n",
                (unsigned long) paddr, (unsigned long) size, hb, hbp,
                rb, (unsigned long) vaddr);
+#endif
     
   if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
       <= (grub_addr_t) (hb + hb->size))