summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/src/9/pc/l.s3
-rw-r--r--sys/src/9/pc64/l.s3
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/src/9/pc/l.s b/sys/src/9/pc/l.s
index 44071a634..0d28ab2f1 100644
--- a/sys/src/9/pc/l.s
+++ b/sys/src/9/pc/l.s
@@ -186,6 +186,9 @@ TEXT mode32bit(SB), $0
MOVL $PADDR(CPU0PTE), AX /* first page of page table */
MOVL $end-KZERO(SB), CX
+
+ ADDL $(16*1024), CX /* qemu puts multiboot data after the kernel */
+
ADDL $(BY2XPG-1), CX
ANDL $~(BY2XPG-1), CX /* round to 4MB */
MOVL CX, MemMin-KZERO(SB) /* see memory.c */
diff --git a/sys/src/9/pc64/l.s b/sys/src/9/pc64/l.s
index 94356a9fb..6736ec42b 100644
--- a/sys/src/9/pc64/l.s
+++ b/sys/src/9/pc64/l.s
@@ -149,6 +149,9 @@ TEXT _warp64<>(SB), 1, $-4
*/
ADDL $PDO(KZERO), AX
MOVL $end-KZERO(SB), CX
+
+ ADDL $(16*1024), CX /* qemu puts multiboot data after the kernel */
+
ADDL $(PGLSZ(1)-1), CX
ANDL $~(PGLSZ(1)-1), CX
MOVL CX, MemMin-KZERO(SB) /* see memory.c */