From b71994843114921fce50f7f82d281147387e5504 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 15 Mar 2010 15:21:31 +0100 Subject: [PATCH] --- yaml --- r: 192537 b: refs/heads/master c: 32e688b8c1afafa389223a4813b97e8c128a1636 h: refs/heads/master i: 192535: 9929eb49edf1b4beb4736871cc189b7e21194bb9 v: v3 --- [refs] | 2 +- trunk/Documentation/filesystems/proc.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46e6f070ead4..9af70cff3e4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31a2d31dbd01a7d530a748e6f708ba047c37fb90 +refs/heads/master: 32e688b8c1afafa389223a4813b97e8c128a1636 diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index a4f30faa4f1f..770700317c2c 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -305,7 +305,7 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7) cgtime guest time of the task children in jiffies .............................................................................. -The /proc/PID/map file containing the currently mapped memory regions and +The /proc/PID/maps file containing the currently mapped memory regions and their access permissions. The format is: