summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-03-30 15:49:26 +0200
committerJonathan Corbet <corbet@lwn.net>2015-04-04 15:20:27 +0200
commitc8a329c777f5a38e39b25425d29b2e37cbb06614 (patch)
tree974d487a38fad1d5ee96e6daf331ee0c9882eb85 /Documentation/filesystems
parentf29ba61d0abad6ad0beed5237cd337b5e25adad7 (diff)
downloadlinux-stable-c8a329c777f5a38e39b25425d29b2e37cbb06614.tar.gz
linux-stable-c8a329c777f5a38e39b25425d29b2e37cbb06614.tar.bz2
linux-stable-c8a329c777f5a38e39b25425d29b2e37cbb06614.zip
doc: Add guest_nice column to example output of `cat /proc/stat'
Commit ce0e7b28fb75cb00 ("sched, cpuacct: Fix niced guest time accounting") added the guest_nice column to /proc/stat, but the example output of `cat /proc/stat' in Documentation/filesystems/proc.txt wasn't updated accordingly. Do so now. Cc: Ryota Ozaki <ozaki.ryota@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/proc.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index a07ba61662ed..f0546401b9e0 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1255,9 +1255,9 @@ Various pieces of information about kernel activity are available in the
since the system first booted. For a quick look, simply cat the file:
> cat /proc/stat
- cpu 2255 34 2290 22625563 6290 127 456 0 0
- cpu0 1132 34 1441 11311718 3675 127 438 0 0
- cpu1 1123 0 849 11313845 2614 0 18 0 0
+ cpu 2255 34 2290 22625563 6290 127 456 0 0 0
+ cpu0 1132 34 1441 11311718 3675 127 438 0 0 0
+ cpu1 1123 0 849 11313845 2614 0 18 0 0 0
intr 114930548 113199788 3 0 5 263 0 4 [... lots more numbers ...]
ctxt 1990473
btime 1062191376