From owner-svn-src-all@FreeBSD.ORG Wed Feb 19 19:11:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95DDC9DC; Wed, 19 Feb 2014 19:11:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64C5118D0; Wed, 19 Feb 2014 19:11:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JJBFQK020277; Wed, 19 Feb 2014 19:11:15 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JJBE5L020268; Wed, 19 Feb 2014 19:11:14 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201402191911.s1JJBE5L020268@svn.freebsd.org> From: John Baldwin Date: Wed, 19 Feb 2014 19:11:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262228 - in stable: 10/sys/kern 10/sys/sys 10/usr.bin/procstat 9/sys/kern 9/sys/sys 9/usr.bin/procstat X-SVN-Group: stable-10 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.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 19:11:15 -0000 Author: jhb Date: Wed Feb 19 19:11:14 2014 New Revision: 262228 URL: http://svnweb.freebsd.org/changeset/base/262228 Log: MFC 261780: Expose OBJT_MGTDEVICE VM objects used for GEM/TTM with drm2 as an explicit object type. Modified: stable/10/sys/kern/kern_proc.c stable/10/sys/sys/user.h stable/10/usr.bin/procstat/procstat.1 stable/10/usr.bin/procstat/procstat_vm.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/kern/kern_proc.c stable/9/sys/sys/user.h stable/9/usr.bin/procstat/procstat.1 stable/9/usr.bin/procstat/procstat_vm.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) stable/9/usr.bin/procstat/ (props changed) Modified: stable/10/sys/kern/kern_proc.c ============================================================================== --- stable/10/sys/kern/kern_proc.c Wed Feb 19 18:36:53 2014 (r262227) +++ stable/10/sys/kern/kern_proc.c Wed Feb 19 19:11:14 2014 (r262228) @@ -2256,6 +2256,9 @@ kern_proc_vmmap_out(struct proc *p, stru case OBJT_SG: kve->kve_type = KVME_TYPE_SG; break; + case OBJT_MGTDEVICE: + kve->kve_type = KVME_TYPE_MGTDEVICE; + break; default: kve->kve_type = KVME_TYPE_UNKNOWN; break; Modified: stable/10/sys/sys/user.h ============================================================================== --- stable/10/sys/sys/user.h Wed Feb 19 18:36:53 2014 (r262227) +++ stable/10/sys/sys/user.h Wed Feb 19 19:11:14 2014 (r262228) @@ -414,6 +414,7 @@ struct kinfo_file { #define KVME_TYPE_PHYS 5 #define KVME_TYPE_DEAD 6 #define KVME_TYPE_SG 7 +#define KVME_TYPE_MGTDEVICE 8 #define KVME_TYPE_UNKNOWN 255 #define KVME_PROT_READ 0x00000001 Modified: stable/10/usr.bin/procstat/procstat.1 ============================================================================== --- stable/10/usr.bin/procstat/procstat.1 Wed Feb 19 18:36:53 2014 (r262227) +++ stable/10/usr.bin/procstat/procstat.1 Wed Feb 19 19:11:14 2014 (r262228) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 27, 2013 +.Dd February 11, 2014 .Dt PROCSTAT 1 .Os .Sh NAME @@ -416,6 +416,9 @@ dead default .It dv device +.It md +device with managed pages +.Pq GEM/TTM .It ph physical .It sg Modified: stable/10/usr.bin/procstat/procstat_vm.c ============================================================================== --- stable/10/usr.bin/procstat/procstat_vm.c Wed Feb 19 18:36:53 2014 (r262227) +++ stable/10/usr.bin/procstat/procstat_vm.c Wed Feb 19 19:11:14 2014 (r262228) @@ -100,6 +100,9 @@ procstat_vm(struct procstat *procstat, s case KVME_TYPE_SG: str = "sg"; break; + case KVME_TYPE_MGTDEVICE: + str = "md"; + break; case KVME_TYPE_UNKNOWN: default: str = "??";