diff options
| author | peter <peter@FreeBSD.org> | 2002-09-07 22:15:47 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-07 22:15:47 +0000 |
| commit | 267650898e90cfd66dc11772d1189dd08dd6e983 (patch) | |
| tree | 6fea782920c3dd251bd17de0f78bf4fbe8cf53dc /sys/compat/pecoff | |
| parent | 93d34a10ac9870d06047ab290d563fd6c5b58a38 (diff) | |
| download | FreeBSD-src-267650898e90cfd66dc11772d1189dd08dd6e983.zip FreeBSD-src-267650898e90cfd66dc11772d1189dd08dd6e983.tar.gz | |
The true value of how the kernel was configured for KSTACK_PAGES was not
available at module compile time. Do not #include the bogus
opt_kstack_pages.h at this point and instead refer to the variables that
are also exported via sysctl.
Diffstat (limited to 'sys/compat/pecoff')
| -rw-r--r-- | sys/compat/pecoff/imgact_pecoff.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c index 4837799..d245fee 100644 --- a/sys/compat/pecoff/imgact_pecoff.c +++ b/sys/compat/pecoff/imgact_pecoff.c @@ -43,8 +43,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_kstack_pages.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/imgact.h> @@ -182,15 +180,16 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp, struct reg regs; #endif - if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) + if (ctob((uarea_pages + kstack_pages) + vm->vm_dsize + vm->vm_ssize) >= + limit) return (EFAULT); - tempuser = malloc(ctob(UAREA_PAGES + KSTACK_PAGES), M_TEMP, + tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP, M_WAITOK | M_ZERO); if (tempuser == NULL) return (ENOMEM); bcopy(p->p_uarea, tempuser, sizeof(struct user)); bcopy(td->td_frame, - tempuser + ctob(UAREA_PAGES) + + tempuser + ctob(uarea_pages) + ((caddr_t) td->td_frame - (caddr_t) td->td_kstack), sizeof(struct trapframe)); PROC_LOCK(p); @@ -207,20 +206,20 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp, printf("%p %p %p\n", ent, ent->prev, ent->next); #endif error = vn_rdwr(UIO_WRITE, vp, (caddr_t) tempuser, - ctob(UAREA_PAGES + KSTACK_PAGES), + ctob(uarea_pages + kstack_pages), (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); free(tempuser, M_TEMP); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)), + (off_t)ctob((uarea_pages + kstack_pages)), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)) + + (off_t)ctob((uarea_pages + kstack_pages)) + ctob(vm->vm_dsize), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return (error); |
