aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/proc.txt
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-12-31 23:34:04 -0500
committerJiri Kosina <jkosina@suse.cz>2014-01-02 04:53:04 -0500
commit49457896d522db195a0fd6b273e5ce4c3b186c6a (patch)
tree5d43602f8b1fa6e08ecb9436d77291fc381ce40d /Documentation/filesystems/proc.txt
parent6e641c943fd5355592b7b955fe3d0f07c927a0aa (diff)
Documentation: update /proc/uptime field description
/proc/uptime has two fields, update description to describe both ala http://lkml.indiana.edu/hypermail/linux/kernel/1312.3/01454.html Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/filesystems/proc.txt')
-rw-r--r--Documentation/filesystems/proc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 22d89aa37218..19e10ab3d569 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -547,7 +547,7 @@ Table 1-5: Kernel info in /proc
547 sys See chapter 2 547 sys See chapter 2
548 sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4) 548 sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4)
549 tty Info of tty drivers 549 tty Info of tty drivers
550 uptime System uptime 550 uptime Wall clock since boot, combined idle time of all cpus
551 version Kernel version 551 version Kernel version
552 video bttv info of video resources (2.4) 552 video bttv info of video resources (2.4)
553 vmallocinfo Show vmalloced areas 553 vmallocinfo Show vmalloced areas