diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2007-04-12 22:14:16 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2007-04-12 22:14:16 +0000 |
| commit | 37f4013a076fcf2727b9b326a013d3678068ac5d (patch) | |
| tree | 2f20108518ca9b7f670f0a876189e4b8c0dd40c3 /sys/kern/kern_sysctl.c | |
| parent | 12cedcbc559e597ed5f6a4fbe8e267492a950a77 (diff) | |
move p_limit and p_cred into struct process
leave macros behind for now to keep the commit small
ok art beck miod pedro
Diffstat (limited to 'sys/kern/kern_sysctl.c')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 0f6b4ae48a5..43e7cbec29b 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.149 2007/03/22 16:55:31 deraadt Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.150 2007/04/12 22:14:15 tedu Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1175,6 +1175,7 @@ fill_eproc(struct proc *p, struct eproc *ep) strncpy(ep->e_emul, p->p_emul->e_name, EMULNAMELEN); ep->e_emul[EMULNAMELEN] = '\0'; ep->e_maxrss = p->p_rlimit ? p->p_rlimit[RLIMIT_RSS].rlim_cur : 0; + ep->e_limit = p->p_p->ps_limit; } #ifndef SMALL_KERNEL @@ -1193,7 +1194,7 @@ fill_kproc2(struct proc *p, struct kinfo_proc2 *ki) ki->p_paddr = PTRTOINT64(p); ki->p_fd = PTRTOINT64(p->p_fd); ki->p_stats = PTRTOINT64(p->p_stats); - ki->p_limit = PTRTOINT64(p->p_limit); + ki->p_limit = PTRTOINT64(p->p_p->ps_limit); ki->p_vmspace = PTRTOINT64(p->p_vmspace); ki->p_sigacts = PTRTOINT64(p->p_sigacts); ki->p_sess = PTRTOINT64(p->p_session); |