aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot/mem.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-04-26 19:29:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-04-26 19:29:33 -0700
commit9d60b0be1b6dd69614c968b009997ef535c14409 (patch)
treed36a082b14613d1c7eca2bd4156ba687e8e08a8f /com32/mboot/mem.c
parent8575c10e6da46ce0c806066668eff786ed9a2f2a (diff)
downloadsyslinux-9d60b0be1b6dd69614c968b009997ef535c14409.tar.gz
syslinux-9d60b0be1b6dd69614c968b009997ef535c14409.tar.xz
syslinux-9d60b0be1b6dd69614c968b009997ef535c14409.zip
mboot: fix cmdline; a few more layout tweaks
Fix module command lines (it was overwriting the main kernel command line); a few minor layout tweaks. In particular, we require the section header to be page-aligned, but not the subsequent sections. With this, I can get Xen to boot. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/mboot/mem.c')
-rw-r--r--com32/mboot/mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/mboot/mem.c b/com32/mboot/mem.c
index ecbf5c1c..e9d8bbdb 100644
--- a/com32/mboot/mem.c
+++ b/com32/mboot/mem.c
@@ -206,7 +206,7 @@ void mboot_make_memmap(void)
mbinfo.mem_upper = (highmem - 0x100000) >> 10;
mbinfo.flags |= MB_INFO_MEMORY;
- /* XXX: Should this be +4? */
+ /* The spec says this address should be +4, but Grub disagrees */
mbinfo.mmap_addr = map_data(ard, nmap*sizeof *ard, 4, false);
if (mbinfo.mmap_addr) {
mbinfo.mmap_length = nmap*sizeof *ard;