diff options
| author | peter <peter@FreeBSD.org> | 2001-08-24 09:56:44 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-08-24 09:56:44 +0000 |
| commit | c05ab921afc21de46a12e5b7ada2f10d8e240df2 (patch) | |
| tree | 982109c69a7c700d8333ffe06b1c62f94c8bd6da /bin | |
| parent | de99d815fde713bcb78bf383bd0ea89afdae4631 (diff) | |
| download | FreeBSD-src-c05ab921afc21de46a12e5b7ada2f10d8e240df2.zip FreeBSD-src-c05ab921afc21de46a12e5b7ada2f10d8e240df2.tar.gz | |
On today's kernels masking with ~KERNBASE is turning out to be less
than useful. It still hits at least 8 digits. Adjust for reality.
This is still not satisfactory for the alpha if you add "-O paddr".
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ps/keyword.c | 4 | ||||
| -rw-r--r-- | bin/ps/print.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index a3d0066..63693d7 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -125,11 +125,11 @@ VAR var[] = { NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "ld"}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld"}, - {"nwchan", "WCHAN", NULL, 0, kvar, NULL, 6, KOFF(ki_wchan), KPTR, "lx"}, + {"nwchan", "WCHAN", NULL, 0, kvar, NULL, 8, KOFF(ki_wchan), KPTR, "lx"}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld"}, {"oublock", "", "oublk"}, - {"paddr", "PADDR", NULL, 0, kvar, NULL, 6, KOFF(ki_paddr), KPTR, "lx"}, + {"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, "lx"}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6}, {"pcpu", "", "%cpu"}, {"pending", "", "sig"}, diff --git a/bin/ps/print.c b/bin/ps/print.c index 62ef392..bd7fc1b 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -432,7 +432,7 @@ wchan(k, ve) k->ki_p->ki_wmesg); else (void)printf("%-*lx", v->width, - (long)k->ki_p->ki_wchan &~ KERNBASE); + (long)k->ki_p->ki_wchan); } else (void)printf("%-*s", v->width, "-"); } @@ -696,7 +696,7 @@ printval(bp, v) (void)printf(ofmt, v->width, *(u_long *)bp); break; case KPTR: - (void)printf(ofmt, v->width, *(u_long *)bp &~ KERNBASE); + (void)printf(ofmt, v->width, *(u_long *)bp); break; default: errx(1, "unknown type %d", v->type); |
