diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-06-12 06:27:11 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-06-12 06:28:09 +0200 |
commit | 9c1d5284c79fea050f115eadeec1dd1758e5c630 (patch) | |
tree | 4d16fd5aad7ff4931e985c0128c5747f23561f8a /Documentation/filesystems | |
parent | kill generic_file_splice_write() (diff) | |
parent | dcache: add missing lockdep annotation (diff) | |
download | linux-9c1d5284c79fea050f115eadeec1dd1758e5c630.tar.xz linux-9c1d5284c79fea050f115eadeec1dd1758e5c630.zip |
Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
Backmerge of dcache.c changes from mainline. It's that, or complete
rebase...
Conflicts:
fs/splice.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/proc.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 8b9cd8eb3f91..264bcde0c51c 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -1245,8 +1245,9 @@ second). The meanings of the columns are as follows, from left to right: The "intr" line gives counts of interrupts serviced since boot time, for each of the possible system interrupts. The first column is the total of all -interrupts serviced; each subsequent column is the total for that particular -interrupt. +interrupts serviced including unnumbered architecture specific interrupts; +each subsequent column is the total for that particular numbered interrupt. +Unnumbered interrupts are not shown, only summed into the total. The "ctxt" line gives the total number of context switches across all CPUs. |