From: Kevin O'Connor <kevin@koconnor.net>
Date: Thu, 15 Oct 2015 17:53:04 +0000 (-0400)
Subject: malloc: Rename csm_malloc_preinit() to malloc_csm_preinit()
X-Git-Tag: rel-1.9.0~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d0393d5af1c3113da82366cbbaeeaac4d984782;p=seabios.git

malloc: Rename csm_malloc_preinit() to malloc_csm_preinit()

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---

diff --git a/src/fw/csm.c b/src/fw/csm.c
index c837d17..7cadd12 100644
--- a/src/fw/csm.c
+++ b/src/fw/csm.c
@@ -10,7 +10,7 @@
 #include "farptr.h" // MAKE_FLATPTR
 #include "hw/pci.h" // pci_probe_devices
 #include "hw/pic.h" // pic_irqmask_read
-#include "malloc.h" // csm_malloc_preinit
+#include "malloc.h" // malloc_csm_preinit
 #include "memmap.h" // SYMBOL
 #include "output.h" // dprintf
 #include "paravirt.h" // qemu_preinit
@@ -95,7 +95,7 @@ handle_csm_0000(struct bregs *regs)
     dprintf(3, "LoPmmMemory     %08x\n", csm_init_table->LowPmmMemory);
     dprintf(3, "LoPmmMemorySize %08x\n", csm_init_table->LowPmmMemorySizeInBytes);
 
-    csm_malloc_preinit(csm_init_table->LowPmmMemory,
+    malloc_csm_preinit(csm_init_table->LowPmmMemory,
                        csm_init_table->LowPmmMemorySizeInBytes,
                        csm_init_table->HiPmmMemory,
                        csm_init_table->HiPmmMemorySizeInBytes);
diff --git a/src/malloc.c b/src/malloc.c
index 5113bb6..3733855 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -451,7 +451,7 @@ malloc_preinit(void)
 }
 
 void
-csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
+malloc_csm_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
 {
     ASSERT32FLAT();
 
diff --git a/src/malloc.h b/src/malloc.h
index f148bfe..960a7f8 100644
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -9,7 +9,7 @@ u32 rom_get_max(void);
 u32 rom_get_last(void);
 struct rom_header *rom_reserve(u32 size);
 int rom_confirm(u32 size);
-void csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm,
+void malloc_csm_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm,
                         u32 hi_pmm_size);
 void malloc_preinit(void);
 extern u32 LegacyRamSize;