From: Ben Gras <ben@minix3.org>
Date: Fri, 19 Dec 2008 15:46:29 +0000 (+0000)
Subject: make space for first code and data pages if so configured.
X-Git-Tag: v3.1.4~159
X-Git-Url: http://zhaoyanbai.com/repos/dnssec-settime.html?a=commitdiff_plain;h=203eb54a4cff59fc0b5e99894f05ed6a140894c6;p=minix.git

make space for first code and data pages if so configured.
---

diff --git a/kernel/arch/i386/mpx386.s b/kernel/arch/i386/mpx386.s
index 15a5cd62f..066df8573 100755
--- a/kernel/arch/i386/mpx386.s
+++ b/kernel/arch/i386/mpx386.s
@@ -43,6 +43,8 @@
 
 ! sections
 
+#include <sys/vm_i386.h>
+
 .sect .text
 begtext:
 .sect .rom
@@ -216,7 +218,12 @@ csinit:
 	ltr	ax
 	push	0			! set flags to known good state
 	popf				! esp, clear nested task and int enable
+#if VM_KERN_NOPAGEZERO
+	jmp	laststep
 
+.align I386_PAGE_SIZE
+laststep:
+#endif
 	jmp	_main			! main()
 
 
@@ -564,6 +571,9 @@ _load_kernel_cr3:
 
 .sect .rom	! Before the string table please
 	.data2	0x526F		! this must be the first data entry (magic #)
+#if VM_KERN_NOPAGEZERO
+.align I386_PAGE_SIZE
+#endif
 
 .sect .bss
 k_stack: