diff options
author | Peter Wemm <peter@FreeBSD.org> | 2004-03-29 19:38:05 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 2004-03-29 19:38:05 +0000 |
commit | 5c89deaefc0a920c7e5d5abc6e39d14121a16f5c (patch) | |
tree | 707adf19bf52b9d3db7bf8c09e21010a79ecf23a /sys | |
parent | 449dfbbc83b7c793dfb3c86b84a6569ae6560d68 (diff) | |
download | src-5c89deaefc0a920c7e5d5abc6e39d14121a16f5c.tar.gz src-5c89deaefc0a920c7e5d5abc6e39d14121a16f5c.zip |
Finish tidying up a couple of leftovers from the KSTACK_PAGES stuff. Some
files still #included the opt_ file. powerpc hadn't been updated yet.
Notes
Notes:
svn path=/head/; revision=127582
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 1 | ||||
-rw-r--r-- | sys/i386/i386/vm_machdep.c | 1 | ||||
-rw-r--r-- | sys/powerpc/aim/vm_machdep.c | 8 | ||||
-rw-r--r-- | sys/powerpc/powerpc/vm_machdep.c | 8 |
4 files changed, 6 insertions, 12 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 77b5095708e9..89a26095b979 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include "opt_isa.h" -#include "opt_kstack_pages.h" #include "opt_cpu.h" #include <sys/param.h> diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 4c3fa5d5252e..feccc01febae 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include "opt_isa.h" -#include "opt_kstack_pages.h" #include "opt_npx.h" #ifdef PC98 #include "opt_pc98.h" diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index d174bc9b4003..9935390e35cf 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -67,8 +67,6 @@ * rights to redistribute these changes. */ -#include "opt_kstack_pages.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> @@ -139,8 +137,8 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) p1 = td1->td_proc; - pcb = (struct pcb *)((td2->td_kstack + KSTACK_PAGES * PAGE_SIZE - - sizeof(struct pcb)) & ~0x2fU); + pcb = (struct pcb *)((td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fU); td2->td_pcb = pcb; /* Copy the pcb */ @@ -357,7 +355,7 @@ cpu_thread_setup(struct thread *td) { struct pcb *pcb; - pcb = (struct pcb *)((td->td_kstack + KSTACK_PAGES * PAGE_SIZE - + pcb = (struct pcb *)((td->td_kstack + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fU); td->td_pcb = pcb; td->td_frame = (struct trapframe *)pcb - 1; diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index d174bc9b4003..9935390e35cf 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -67,8 +67,6 @@ * rights to redistribute these changes. */ -#include "opt_kstack_pages.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> @@ -139,8 +137,8 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) p1 = td1->td_proc; - pcb = (struct pcb *)((td2->td_kstack + KSTACK_PAGES * PAGE_SIZE - - sizeof(struct pcb)) & ~0x2fU); + pcb = (struct pcb *)((td2->td_kstack + + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fU); td2->td_pcb = pcb; /* Copy the pcb */ @@ -357,7 +355,7 @@ cpu_thread_setup(struct thread *td) { struct pcb *pcb; - pcb = (struct pcb *)((td->td_kstack + KSTACK_PAGES * PAGE_SIZE - + pcb = (struct pcb *)((td->td_kstack + td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fU); td->td_pcb = pcb; td->td_frame = (struct trapframe *)pcb - 1; |