diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2013-09-14 20:23:54 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2013-09-18 20:48:34 -0400 |
| commit | 9dea59025f8aa3742ff5b27d1772e1651066ffb9 (patch) | |
| tree | 98df1ab2466f14dffee39a7a56db813db6ad3aef /src/fw/csm.c | |
| parent | 41639f80b6405563bf36844f3aeab1b6fe912ec6 (diff) | |
| download | qemu-seabios-9dea59025f8aa3742ff5b27d1772e1651066ffb9.tar.gz | |
Move malloc code from pmm.c to new files malloc.c and malloc.h.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/fw/csm.c')
| -rw-r--r-- | src/fw/csm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fw/csm.c b/src/fw/csm.c index 81159b3..9e73a40 100644 --- a/src/fw/csm.c +++ b/src/fw/csm.c @@ -17,6 +17,7 @@ #include "boot.h" #include "smbios.h" #include "hw/pic.h" +#include "malloc.h" // csm_malloc_preinit #include "stacks.h" // wait_threads struct rsdp_descriptor csm_rsdp VARFSEG __aligned(16); @@ -250,9 +251,9 @@ handle_csm_0006(struct bregs *regs) size, align, region); if (region & 2) - chunk = pmm_malloc(&ZoneLow, PMM_DEFAULT_HANDLE, size, align); + chunk = _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, align); if (!chunk && (region & 1)) - chunk = pmm_malloc(&ZoneFSeg, PMM_DEFAULT_HANDLE, size, align); + chunk = _malloc(&ZoneFSeg, MALLOC_DEFAULT_HANDLE, size, align); dprintf(3, "Legacy16GetTableAddress size %x align %x region %d yields %p\n", size, align, region, chunk); |