]> Zhao Yanbai Git Server - minix.git/commitdiff
make space for first code and data pages if so configured.
authorBen Gras <ben@minix3.org>
Fri, 19 Dec 2008 15:46:29 +0000 (15:46 +0000)
committerBen Gras <ben@minix3.org>
Fri, 19 Dec 2008 15:46:29 +0000 (15:46 +0000)
kernel/arch/i386/mpx386.s

index 15a5cd62fead99c9d477253a9bc22be39ef2bc19..066df8573d21baab5577f5ef93ad0dd3f089c89d 100755 (executable)
@@ -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: