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.

3 files changed, 19 insertions, 22 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);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 9449d3c..4e1f3e5 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -735,36 +735,36 @@ linux_aout_coredump(struct thread *td, struct vnode *vp, off_t limit)
 	caddr_t tempuser;
 	int error;
 
-	if (ctob((UAREA_PAGES + KSTACK_PAGES) +
+	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);
 	fill_kinfo_proc(p, &p->p_uarea->u_kproc);
 	PROC_UNLOCK(p);
 	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(UIO_WRITE, vp, vm->vm_daddr,
 		    (int)ctob(vm->vm_dsize),
-		    (off_t)ctob(UAREA_PAGES + KSTACK_PAGES), UIO_USERSPACE,
+		    (off_t)ctob(uarea_pages + kstack_pages), UIO_USERSPACE,
 		    IO_UNIT | IO_DIRECT, 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 | IO_DIRECT, cred, NOCRED, (int *) NULL, td);
 	return (error);
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index eee4539..e21358a 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -26,8 +26,6 @@
  * $FreeBSD$
  */
 
-#include "opt_kstack_pages.h"
-
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/fcntl.h>
@@ -277,36 +275,36 @@ aout_coredump(td, vp, limit)
 	caddr_t tempuser;
 	int error;
 
-	if (ctob((UAREA_PAGES + KSTACK_PAGES)
+	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);
 	fill_kinfo_proc(p, &p->p_uarea->u_kproc);
 	PROC_UNLOCK(p);
 	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(UIO_WRITE, vp, vm->vm_daddr,
 		    (int)ctob(vm->vm_dsize),
-		    (off_t)ctob(UAREA_PAGES + KSTACK_PAGES), UIO_USERSPACE,
+		    (off_t)ctob(uarea_pages + kstack_pages), UIO_USERSPACE,
 		    IO_UNIT | IO_DIRECT, 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 | IO_DIRECT, cred, NOCRED, (int *) NULL, td);
 	return (error);