diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:30:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:30:49 -0500 |
| commit | 897e81bea1fcfcd2c5cdb720c9efdb25da9ff374 (patch) | |
| tree | 92cf33ed2c35c1ece633f09365702f1c8e24d415 /Documentation/filesystems | |
| parent | c3fa27d1367fac63ac8533d6f20ea851d0d70a10 (diff) | |
| parent | 0cf55e1ec08bb5a22e068309e2d8ba1180ab4239 (diff) | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (35 commits)
sched, cputime: Introduce thread_group_times()
sched, cputime: Cleanups related to task_times()
Revert "sched, x86: Optimize branch hint in __switch_to()"
sched: Fix isolcpus boot option
sched: Revert 498657a478c60be092208422fefa9c7b248729c2
sched, time: Define nsecs_to_jiffies()
sched: Remove task_{u,s,g}time()
sched: Introduce task_times() to replace task_{u,s}time() pair
sched: Limit the number of scheduler debug messages
sched.c: Call debug_show_all_locks() when dumping all tasks
sched, x86: Optimize branch hint in __switch_to()
sched: Optimize branch hint in context_switch()
sched: Optimize branch hint in pick_next_task_fair()
sched_feat_write(): Update ppos instead of file->f_pos
sched: Sched_rt_periodic_timer vs cpu hotplug
sched, kvm: Fix race condition involving sched_in_preempt_notifers
sched: More generic WAKE_AFFINE vs select_idle_sibling()
sched: Cleanup select_task_rq_fair()
sched: Fix granularity of task_u/stime()
sched: Fix/add missing update_rq_clock() calls
...
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 2c48f945546b..4af0018533f2 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -1072,7 +1072,8 @@ second). The meanings of the columns are as follows, from left to right: | |||
| 1072 | - irq: servicing interrupts | 1072 | - irq: servicing interrupts |
| 1073 | - softirq: servicing softirqs | 1073 | - softirq: servicing softirqs |
| 1074 | - steal: involuntary wait | 1074 | - steal: involuntary wait |
| 1075 | - guest: running a guest | 1075 | - guest: running a normal guest |
| 1076 | - guest_nice: running a niced guest | ||
| 1076 | 1077 | ||
| 1077 | The "intr" line gives counts of interrupts serviced since boot time, for each | 1078 | The "intr" line gives counts of interrupts serviced since boot time, for each |
| 1078 | of the possible system interrupts. The first column is the total of all | 1079 | of the possible system interrupts. The first column is the total of all |