From 536062099a5a88fddc93e0ed01109106bf45dd22 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 1 Dec 2017 11:32:05 +0000
Subject: [PATCH] Add "vmaddr" ps(1) keyword.

Obtained from:	CheriBSD
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
---
 bin/ps/keyword.c | 2 ++
 bin/ps/ps.1      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 96f88b516781..c9d4427ad53d 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -225,6 +225,8 @@ static VAR var[] = {
 	{"usertime", "USERTIME", NULL, "user-time", USER, usertime, 0, CHAR,
 	    NULL, 0},
 	{"usrpri", "", "upr", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"vmaddr", "VMADDR", NULL, "vmspace-address", 0, kvar, KOFF(ki_vmspace),
+	    KPTR, "lx", 0},
 	{"vsize", "", "vsz", NULL, 0, NULL, 0, CHAR, NULL, 0},
 	{"vsz", "VSZ", NULL, "virtual-size", 0, vsize, 0, CHAR, NULL, 0},
 	{"wchan", "WCHAN", NULL, "wait-channel", LJUST, wchan, 0, CHAR, NULL,
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 67bea88f1a4d..deb22f63ad4d 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd October 9, 2017
+.Dd December 1, 2017
 .Dt PS 1
 .Os
 .Sh NAME
@@ -710,6 +710,8 @@ process pointer
 user name (from UID)
 .It Cm usertime
 accumulated user CPU time
+.It Cm vmaddr
+vmspace pointer
 .It Cm vsz
 virtual size in Kbytes (alias
 .Cm vsize )