MFi386: revisions 1.572, 1.573 and 1.574.

This commit is contained in:
Yoshihiro Takahashi 2003-10-05 09:05:45 +00:00
parent d4b3b85f35
commit 98120869b4
2 changed files with 16 additions and 4 deletions

View File

@ -1294,7 +1294,7 @@ struct soft_segment_descriptor gdt_segs[] = {
/* GPROC0_SEL 4 Proc 0 Tss Descriptor */
{
0x0, /* segment base address */
sizeof(struct i386tss)-1,/* length - all address space */
sizeof(struct i386tss)-1,/* length */
SDT_SYS386TSS, /* segment type */
0, /* segment descriptor priority level */
1, /* segment descriptor present */
@ -1580,6 +1580,12 @@ getmemsize(int first)
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* Map the page at address zero for the bios code to use.
* Note that page zero is not in the general page pool.
*/
pmap_kenter(KERNBASE, 0);
/*
* if basemem != 640, map pages r/w into vm86 page table so
* that the bios can scribble on it.
@ -1862,7 +1868,7 @@ next_run: ;
/*
* block out kernel memory as not available.
*/
if (pa >= 0x100000 && pa < first)
if (pa >= KERNLOAD && pa < first)
continue;
page_bad = FALSE;

View File

@ -1294,7 +1294,7 @@ struct soft_segment_descriptor gdt_segs[] = {
/* GPROC0_SEL 4 Proc 0 Tss Descriptor */
{
0x0, /* segment base address */
sizeof(struct i386tss)-1,/* length - all address space */
sizeof(struct i386tss)-1,/* length */
SDT_SYS386TSS, /* segment type */
0, /* segment descriptor priority level */
1, /* segment descriptor present */
@ -1580,6 +1580,12 @@ getmemsize(int first)
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* Map the page at address zero for the bios code to use.
* Note that page zero is not in the general page pool.
*/
pmap_kenter(KERNBASE, 0);
/*
* if basemem != 640, map pages r/w into vm86 page table so
* that the bios can scribble on it.
@ -1862,7 +1868,7 @@ next_run: ;
/*
* block out kernel memory as not available.
*/
if (pa >= 0x100000 && pa < first)
if (pa >= KERNLOAD && pa < first)
continue;
page_bad = FALSE;