aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 08:56:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 08:56:56 -0700
commit357ed6b1a110048ff8106f99092d6c4a7aadb45a (patch)
treeff4eb7e809e547bc3c0680dfd51793a8f57b2063 /Documentation
parentde505e709ffb09a7382ca8e0d8c7dbb171ba5830 (diff)
parentf8b7fc6b514f34a51875dd48dff70d4d17a54f38 (diff)
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: Move RCU_BOOST #ifdefs to header file rcu: use softirq instead of kthreads except when RCU_BOOST=y rcu: Use softirq to address performance regression rcu: Simplify curing of load woes
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/proc.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index f4817802406..db3b1aba32a 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -843,6 +843,7 @@ Provides counts of softirq handlers serviced since boot time, for each cpu.
TASKLET: 0 0 0 290
SCHED: 27035 26983 26971 26746
HRTIMER: 0 0 0 0
+ RCU: 1678 1769 2178 2250
1.3 IDE devices in /proc/ide