summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/i386/i386/locore.s5
-rw-r--r--sys/i386/i386/machdep.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index bd25fe8..2579ba7 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -788,12 +788,7 @@ no_kernend:
/* Map read-only from zero to the beginning of the kernel text section */
xorl %eax, %eax
-#ifdef BURN_BRIDGES
xorl %edx,%edx
-#else
-/* XXX emulate bugs in the old PSE code so that apm works */
- movl $PG_RW,%edx
-#endif
movl $R(btext),%ecx
addl $PAGE_MASK,%ecx
shrl $PAGE_SHIFT,%ecx
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 01149ba..ae38722 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1555,6 +1555,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.
*/
OpenPOWER on IntegriCloud