From owner-svn-src-all@freebsd.org  Fri Dec  1 11:32:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83976DFD160;
 Fri,  1 Dec 2017 11:32:06 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 50E1A7D985;
 Fri,  1 Dec 2017 11:32:06 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB1BW5S6002698;
 Fri, 1 Dec 2017 11:32:05 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1BW5ID002696;
 Fri, 1 Dec 2017 11:32:05 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201712011132.vB1BW5ID002696@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 1 Dec 2017 11:32:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326430 - head/bin/ps
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/bin/ps
X-SVN-Commit-Revision: 326430
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Dec 2017 11:32:06 -0000

Author: trasz
Date: Fri Dec  1 11:32:05 2017
New Revision: 326430
URL: https://svnweb.freebsd.org/changeset/base/326430

Log:
  Add "vmaddr" ps(1) keyword.
  
  Obtained from:	CheriBSD
  MFC after:	2 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/bin/ps/keyword.c
  head/bin/ps/ps.1

Modified: head/bin/ps/keyword.c
==============================================================================
--- head/bin/ps/keyword.c	Fri Dec  1 11:18:19 2017	(r326429)
+++ head/bin/ps/keyword.c	Fri Dec  1 11:32:05 2017	(r326430)
@@ -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,

Modified: head/bin/ps/ps.1
==============================================================================
--- head/bin/ps/ps.1	Fri Dec  1 11:18:19 2017	(r326429)
+++ head/bin/ps/ps.1	Fri Dec  1 11:32:05 2017	(r326430)
@@ -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 )