From ef49a94104e35e94eb80bd95c677d1db812b4a73 Mon Sep 17 00:00:00 2001 From: Jake Burkholder <jake@FreeBSD.org> Date: Sun, 23 Feb 2003 22:12:08 +0000 Subject: [PATCH] Previous commit missed a 1 that should be NGPTD, and an NPDEPG that should be NPDEPTD. Grumble. Sponsored by: DARPA, Network Associates Laboratories --- sys/amd64/amd64/genassym.c | 1 + sys/amd64/amd64/locore.S | 2 +- sys/amd64/amd64/locore.s | 2 +- sys/amd64/include/pmap.h | 2 +- sys/i386/i386/genassym.c | 1 + sys/i386/i386/locore.s | 2 +- sys/i386/include/pmap.h | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index e681e2081999..710b7b0a3670 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 38ac21129757..d1bac0658907 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 38ac21129757..d1bac0658907 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 0cd3944736d4..7fdb6604ae0b 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 e681e2081999..710b7b0a3670 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 38ac21129757..d1bac0658907 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 0cd3944736d4..7fdb6604ae0b 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 */