summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/pmap.c13
-rw-r--r--sys/i386/i386/machdep.c4
-rw-r--r--sys/i386/i386/pmap.c8
-rw-r--r--sys/i386/include/pmap.h4
-rw-r--r--sys/i386/xen/pmap.c4
-rw-r--r--sys/pc98/pc98/machdep.c4
6 files changed, 16 insertions, 21 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 2b61023..05ae8bb 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -812,7 +812,7 @@ void
pmap_bootstrap(vm_paddr_t *firstaddr)
{
vm_offset_t va;
- pt_entry_t *pte, *unused;
+ pt_entry_t *pte;
/*
* Create an initial set of page tables to run the kernel in.
@@ -858,14 +858,11 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
pte = vtopte(va);
/*
- * CMAP1 is only used for the memory test.
- */
- SYSMAP(caddr_t, CMAP1, CADDR1, 1)
-
- /*
- * Crashdump maps.
+ * Crashdump maps. The first page is reused as CMAP1 for the
+ * memory test.
*/
- SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS)
+ SYSMAP(caddr_t, CMAP1, crashdumpmap, MAXDUMPPGS)
+ CADDR1 = crashdumpmap;
virtual_avail = va;
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 2e1785b..9e25cd9 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -2387,7 +2387,7 @@ physmap_done:
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
dump_avail[da_indx] = physmap[0];
- pte = CMAP1;
+ pte = CMAP3;
/*
* Get dcons buffer address
@@ -2409,7 +2409,7 @@ physmap_done:
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad, full;
- int *ptr = (int *)CADDR1;
+ int *ptr = (int *)CADDR3;
full = FALSE;
/*
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index d5f31ec..1f9acfe 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -256,11 +256,10 @@ struct sysmaps {
caddr_t CADDR2;
};
static struct sysmaps sysmaps_pcpu[MAXCPU];
-pt_entry_t *CMAP1 = 0;
-static pt_entry_t *CMAP3;
+pt_entry_t *CMAP3;
static pd_entry_t *KPTD;
-caddr_t CADDR1 = 0, ptvmmap = 0;
-static caddr_t CADDR3;
+caddr_t ptvmmap = 0;
+caddr_t CADDR3;
struct msgbuf *msgbufp = 0;
/*
@@ -434,7 +433,6 @@ pmap_bootstrap(vm_paddr_t firstaddr)
SYSMAP(caddr_t, sysmaps->CMAP1, sysmaps->CADDR1, 1)
SYSMAP(caddr_t, sysmaps->CMAP2, sysmaps->CADDR2, 1)
}
- SYSMAP(caddr_t, CMAP1, CADDR1, 1)
SYSMAP(caddr_t, CMAP3, CADDR3, 1)
/*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 0303c60..100475c 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -420,8 +420,8 @@ struct pv_chunk {
#ifdef _KERNEL
-extern caddr_t CADDR1;
-extern pt_entry_t *CMAP1;
+extern caddr_t CADDR3;
+extern pt_entry_t *CMAP3;
extern vm_paddr_t phys_avail[];
extern vm_paddr_t dump_avail[];
extern int pseflag;
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c
index 9f3e8bb..fa9bda8 100644
--- a/sys/i386/xen/pmap.c
+++ b/sys/i386/xen/pmap.c
@@ -249,9 +249,9 @@ struct sysmaps {
caddr_t CADDR2;
};
static struct sysmaps sysmaps_pcpu[MAXCPU];
-static pt_entry_t *CMAP3;
+pt_entry_t *CMAP3;
caddr_t ptvmmap = 0;
-static caddr_t CADDR3;
+caddr_t CADDR3;
struct msgbuf *msgbufp = 0;
/*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index a4887c6..a5b799d 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -1962,7 +1962,7 @@ getmemsize(int first)
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
dump_avail[da_indx] = physmap[0];
- pte = CMAP1;
+ pte = CMAP3;
/*
* Get dcons buffer address
@@ -1983,7 +1983,7 @@ getmemsize(int first)
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad, full;
- int *ptr = (int *)CADDR1;
+ int *ptr = (int *)CADDR3;
full = FALSE;
/*
OpenPOWER on IntegriCloud