meminfo: If we allocate with lmalloc() we should free with lfree()
authorMatt Fleming <matt.fleming@intel.com>
Tue, 3 Apr 2012 11:12:50 +0000 (12:12 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 17 Apr 2012 09:58:35 +0000 (10:58 +0100)
Since commit 74518b8b691c ("elflink: Make ELF the default object
format") we've been using lmalloc() with free() instead of lfree().
This bug was pointed out by the following build warnings,

meminfo.c: In function ‘dump_e820’:
meminfo.c:93:5: warning: implicit declaration of function ‘free’
meminfo.c:93:5: warning: incompatible implicit declaration of built-in function ‘free’
vesainfo.c: In function ‘print_modes’:
vesainfo.c:82:2: warning: implicit declaration of function ‘free’
vesainfo.c:82:2: warning: incompatible implicit declaration of built-in function ‘free’

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
com32/modules/meminfo.c
com32/modules/vesainfo.c

index 00d0e14..a1abc36 100644 (file)
@@ -44,9 +44,9 @@ static void dump_e820(void)
     uint32_t type;
     void *low_ed;
 
-       low_ed = lmalloc(sizeof ed);
-       if (!low_ed)
-               return;
+    low_ed = lmalloc(sizeof ed);
+    if (!low_ed)
+       return;
 
     memset(&ireg, 0, sizeof ireg);
 
@@ -90,7 +90,7 @@ static void dump_e820(void)
        ireg.ebx.l = oreg.ebx.l;
     } while (ireg.ebx.l);
 
-    free(low_ed);
+    lfree(low_ed);
 }
 
 static void dump_legacy(void)
index 86a4365..382bd14 100644 (file)
@@ -79,7 +79,7 @@ static void print_modes(void)
     }
 
 exit:
-       free(vesa);
+       lfree(vesa);
        return;
 }