diff options
| author | Rob Landley <rob@landley.net> | 2014-01-01 05:34:04 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-01-02 10:53:04 +0100 |
| commit | 49457896d522db195a0fd6b273e5ce4c3b186c6a (patch) | |
| tree | 5d43602f8b1fa6e08ecb9436d77291fc381ce40d /Documentation | |
| parent | Documentation: Fix size parameter for snprintf (diff) | |
| download | linux-49457896d522db195a0fd6b273e5ce4c3b186c6a.tar.xz linux-49457896d522db195a0fd6b273e5ce4c3b186c6a.zip | |
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')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 2 |
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 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 |