summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2003-10-05 09:05:45 +0000
committernyan <nyan@FreeBSD.org>2003-10-05 09:05:45 +0000
commitb60346b21b15d66a054ca9304a6ead8d644a8501 (patch)
tree68d7605d747fbe6400d17ecc4c4d3ae49a70acab /sys/pc98
parent937fbbdfd45bc7b0b66ef67106d8294d97bdde87 (diff)
downloadFreeBSD-src-b60346b21b15d66a054ca9304a6ead8d644a8501.zip
FreeBSD-src-b60346b21b15d66a054ca9304a6ead8d644a8501.tar.gz
MFi386: revisions 1.572, 1.573 and 1.574.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/i386/machdep.c10
-rw-r--r--sys/pc98/pc98/machdep.c10
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index cadbba3..8c2479c 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -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 */
@@ -1581,6 +1581,12 @@ getmemsize(int first)
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 @@ physmap_done:
/*
* block out kernel memory as not available.
*/
- if (pa >= 0x100000 && pa < first)
+ if (pa >= KERNLOAD && pa < first)
continue;
page_bad = FALSE;
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index cadbba3..8c2479c 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -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 */
@@ -1581,6 +1581,12 @@ getmemsize(int first)
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 @@ physmap_done:
/*
* block out kernel memory as not available.
*/
- if (pa >= 0x100000 && pa < first)
+ if (pa >= KERNLOAD && pa < first)
continue;
page_bad = FALSE;
OpenPOWER on IntegriCloud