summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgreen <green@FreeBSD.org>2004-02-14 01:30:06 +0000
committergreen <green@FreeBSD.org>2004-02-14 01:30:06 +0000
commit7211bcf2019b26fb855f291b27f8ba11d8e28b30 (patch)
treee6ce2976d97e7825316f3124906543054ca3dc91
parent54a86bd2b3dce59705a2117e19fe39d416e6c9f1 (diff)
downloadFreeBSD-src-7211bcf2019b26fb855f291b27f8ba11d8e28b30.zip
FreeBSD-src-7211bcf2019b26fb855f291b27f8ba11d8e28b30.tar.gz
T -CURRENT DO NOT CRASH UPON ^T K PLZ THX.
Also, use sched_pctcpu() instead of assuming td->td_kse is non-NULL.
-rw-r--r--sys/kern/tty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 52ba2b6..a3d8e35 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -103,6 +103,7 @@ __FBSDID("$FreeBSD$");
#include <sys/resourcevar.h>
#include <sys/malloc.h>
#include <sys/filedesc.h>
+#include <sys/sched.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
@@ -2467,7 +2468,7 @@ ttyinfo(struct tty *tp)
else
state = "unknown";
calcru(pick, &utime, &stime, NULL);
- pctcpu = (td->td_kse->ke_pctcpu * 10000 + FSCALE / 2) >> FSHIFT;
+ pctcpu = (sched_pctcpu(td) * 10000 + FSCALE / 2) >> FSHIFT;
if (pick->p_state == PRS_NEW || pick->p_state == PRS_ZOMBIE)
rss = 0;
else
OpenPOWER on IntegriCloud