From: Rob Landley Date: Wed, 1 Jan 2014 04:34:04 +0000 (-0600) Subject: Documentation: update /proc/uptime field description X-Git-Tag: firefly_0821_release~176^2~4169^2~31 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=49457896d522db195a0fd6b273e5ce4c3b186c6a;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Jiri Kosina --- 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 sys See chapter 2 sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4) tty Info of tty drivers - uptime System uptime + uptime Wall clock since boot, combined idle time of all cpus version Kernel version video bttv info of video resources (2.4) vmallocinfo Show vmalloced areas