summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2003-04-01 15:02:05 +0000
committerthorpej <thorpej@NetBSD.org>2003-04-01 15:02:05 +0000
commitd071d9a8d09456fa6c65da8bb12e04c96080296e (patch)
tree2960074fd22911c273f0751ba0da4cfd87b7de74 /sys/compat/linux/common
parenta24d2220671af356901da799799cf4e9a61f6ed1 (diff)
Use PAGE_SIZE rather than NBPG.
Diffstat (limited to 'sys/compat/linux/common')
-rw-r--r--sys/compat/linux/common/linux_exec_aout.c11
-rw-r--r--sys/compat/linux/common/linux_uselib.c8
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/compat/linux/common/linux_exec_aout.c b/sys/compat/linux/common/linux_exec_aout.c
index d7b26e8cb7b..cf50d2a2cbf 100644
--- a/sys/compat/linux/common/linux_exec_aout.c
+++ b/sys/compat/linux/common/linux_exec_aout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_aout.c,v 1.51 2003/01/18 08:02:51 thorpej Exp $ */
+/* $NetBSD: linux_exec_aout.c,v 1.52 2003/04/01 15:05:11 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.51 2003/01/18 08:02:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.52 2003/04/01 15:05:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@ exec_linux_aout_prep_nmagic(p, epp)
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/* set up command for bss segment */
- baddr = roundup(epp->ep_daddr + execp->a_data, NBPG);
+ baddr = roundup(epp->ep_daddr + execp->a_data, PAGE_SIZE);
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
@@ -272,7 +272,7 @@ exec_linux_aout_prep_omagic(p, epp)
LINUX_N_TXTOFF(*execp, OMAGIC), VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/* set up command for bss segment */
- baddr = roundup(epp->ep_daddr + execp->a_data, NBPG);
+ baddr = roundup(epp->ep_daddr + execp->a_data, PAGE_SIZE);
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
@@ -286,7 +286,8 @@ exec_linux_aout_prep_omagic(p, epp)
* Compensate `ep_dsize' for the amount of data covered by the last
* text page.
*/
- dsize = epp->ep_dsize + execp->a_text - roundup(execp->a_text, NBPG);
+ dsize = epp->ep_dsize + execp->a_text - roundup(execp->a_text,
+ PAGE_SIZE);
epp->ep_dsize = (dsize > 0) ? dsize : 0;
return exec_aout_setup_stack(p, epp);
}
diff --git a/sys/compat/linux/common/linux_uselib.c b/sys/compat/linux/common/linux_uselib.c
index 71dd2582c34..fecd4f7c2e3 100644
--- a/sys/compat/linux/common/linux_uselib.c
+++ b/sys/compat/linux/common/linux_uselib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_uselib.c,v 1.9 2003/01/18 21:21:40 thorpej Exp $ */
+/* $NetBSD: linux_uselib.c,v 1.10 2003/04/01 15:05:12 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.9 2003/01/18 21:21:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.10 2003/04/01 15:05:12 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,7 @@ linux_sys_uselib(l, v, retval)
return ENOEXEC;
magic = LINUX_N_MAGIC(&hdr);
- taddr = hdr.a_entry & (~(NBPG - 1));
+ taddr = hdr.a_entry & (~(PAGE_SIZE - 1));
tsize = hdr.a_text;
daddr = taddr + tsize;
dsize = hdr.a_data + hdr.a_bss;
@@ -151,7 +151,7 @@ linux_sys_uselib(l, v, retval)
vp, LINUX_N_TXTOFF(hdr, magic),
VM_PROT_READ|VM_PROT_EXECUTE|VM_PROT_WRITE);
- baddr = roundup(daddr + hdr.a_data, NBPG);
+ baddr = roundup(daddr + hdr.a_data, PAGE_SIZE);
bsize = daddr + dsize - baddr;
if (bsize > 0) {
NEW_VMCMD(&vcset, vmcmd_map_zero, bsize, baddr,