diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2013-02-07 00:06:18 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2013-02-07 00:06:18 -0500 |
commit | 13fd0a5c37370951b77e9ed4891486728b03c0fb (patch) | |
tree | eb076e2a392c39a6c099f34fea11d570ae1e1240 /src/pmm.c | |
parent | 749965cef8e43c76956df551f63e69584ecce836 (diff) | |
download | qemu-seabios-13fd0a5c37370951b77e9ed4891486728b03c0fb.tar.gz |
Fix rebase error in commit 8a0a972f that broke LOWMEM variables.
Due to a rebase error, commit 8a0a972f caused LOWMEM variables to not
be initialized correctly.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/pmm.c')
-rw-r--r-- | src/pmm.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -272,6 +272,10 @@ malloc_fixupreloc_init(void) zone->info->pprev = &zone->info; } + // Move low-memory initial variable content to new location. + extern u8 datalow_start[], datalow_end[], final_datalow_start[]; + memmove(final_datalow_start, datalow_start, datalow_end - datalow_start); + // Add space free'd during relocation in f-segment to ZoneFSeg extern u8 code32init_end[]; if ((u32)code32init_end > BUILD_BIOS_ADDR) { |