summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjake <jake@FreeBSD.org>2003-02-23 22:12:08 +0000
committerjake <jake@FreeBSD.org>2003-02-23 22:12:08 +0000
commite12ad10b6b19c7255016b76286c1a817fd8529bb (patch)
treefd3a0fdd154e336a2e7881bdb2405e37d1089deb /sys
parent56781869226b18df9f6aa3dd84a7a2268ad05f1f (diff)
downloadFreeBSD-src-e12ad10b6b19c7255016b76286c1a817fd8529bb.zip
FreeBSD-src-e12ad10b6b19c7255016b76286c1a817fd8529bb.tar.gz
Previous commit missed a 1 that should be NGPTD, and an NPDEPG that should
be NPDEPTD. Grumble. Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/genassym.c1
-rw-r--r--sys/amd64/amd64/locore.S2
-rw-r--r--sys/amd64/amd64/locore.s2
-rw-r--r--sys/amd64/include/pmap.h2
-rw-r--r--sys/i386/i386/genassym.c1
-rw-r--r--sys/i386/i386/locore.s2
-rw-r--r--sys/i386/include/pmap.h2
7 files changed, 7 insertions, 5 deletions
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index e681e20..710b7b0 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -108,6 +108,7 @@ ASSYM(KSTACK_PAGES, KSTACK_PAGES);
ASSYM(PAGE_SIZE, PAGE_SIZE);
ASSYM(NPTEPG, NPTEPG);
ASSYM(NPDEPG, NPDEPG);
+ASSYM(NPDEPTD, NPDEPTD);
ASSYM(NPGPTD, NPGPTD);
ASSYM(PDESIZE, sizeof(pd_entry_t));
ASSYM(PTESIZE, sizeof(pt_entry_t));
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 38ac211..d1bac06 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -886,7 +886,7 @@ no_kernend:
/* install a pde recursively mapping page directory as a page table */
movl R(IdlePTD), %eax
movl $PTDPTDI, %ebx
- movl $1,%ecx
+ movl $NPGPTD,%ecx
fillkpt(R(IdlePTD), $PG_RW)
ret
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 38ac211..d1bac06 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -886,7 +886,7 @@ no_kernend:
/* install a pde recursively mapping page directory as a page table */
movl R(IdlePTD), %eax
movl $PTDPTDI, %ebx
- movl $1,%ecx
+ movl $NPGPTD,%ecx
fillkpt(R(IdlePTD), $PG_RW)
ret
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 0cd3944..7fdb660 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -115,7 +115,7 @@
*
* SMP_PRIVPAGES: The per-cpu address space is 0xff80000 -> 0xffbfffff
*/
-#define APTDPTDI (NPDEPG-NPGPTD) /* alt ptd entry that points to APTD */
+#define APTDPTDI (NPDEPTD-NPGPTD) /* alt ptd entry that points to APTD */
#ifdef SMP
#define MPPTDI (APTDPTDI-1) /* per cpu ptd entry */
#define KPTDI (MPPTDI-NKPDE) /* start of kernel virtual pde's */
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index e681e20..710b7b0 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -108,6 +108,7 @@ ASSYM(KSTACK_PAGES, KSTACK_PAGES);
ASSYM(PAGE_SIZE, PAGE_SIZE);
ASSYM(NPTEPG, NPTEPG);
ASSYM(NPDEPG, NPDEPG);
+ASSYM(NPDEPTD, NPDEPTD);
ASSYM(NPGPTD, NPGPTD);
ASSYM(PDESIZE, sizeof(pd_entry_t));
ASSYM(PTESIZE, sizeof(pt_entry_t));
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 38ac211..d1bac06 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -886,7 +886,7 @@ no_kernend:
/* install a pde recursively mapping page directory as a page table */
movl R(IdlePTD), %eax
movl $PTDPTDI, %ebx
- movl $1,%ecx
+ movl $NPGPTD,%ecx
fillkpt(R(IdlePTD), $PG_RW)
ret
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 0cd3944..7fdb660 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -115,7 +115,7 @@
*
* SMP_PRIVPAGES: The per-cpu address space is 0xff80000 -> 0xffbfffff
*/
-#define APTDPTDI (NPDEPG-NPGPTD) /* alt ptd entry that points to APTD */
+#define APTDPTDI (NPDEPTD-NPGPTD) /* alt ptd entry that points to APTD */
#ifdef SMP
#define MPPTDI (APTDPTDI-1) /* per cpu ptd entry */
#define KPTDI (MPPTDI-NKPDE) /* start of kernel virtual pde's */
OpenPOWER on IntegriCloud