diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 15:27:26 -0400 |
| commit | ee9a3607fb03e804ddf624544105f4e34260c380 (patch) | |
| tree | ce41b6e0fa10982a306f6c142a92dbf3c9961284 /init/Kconfig | |
| parent | b492e95be0ae672922f4734acf3f5d35c30be948 (diff) | |
| parent | d515e86e639890b33a09390d062b0831664f04a2 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 087c14f3c595..2cce9f343ad0 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -604,8 +604,7 @@ config RT_GROUP_SCHED | |||
| 604 | default n | 604 | default n |
| 605 | help | 605 | help |
| 606 | This feature lets you explicitly allocate real CPU bandwidth | 606 | This feature lets you explicitly allocate real CPU bandwidth |
| 607 | to users or control groups (depending on the "Basis for grouping tasks" | 607 | to task groups. If enabled, it will also make it impossible to |
| 608 | setting below. If enabled, it will also make it impossible to | ||
| 609 | schedule realtime tasks for non-root users until you allocate | 608 | schedule realtime tasks for non-root users until you allocate |
| 610 | realtime bandwidth for them. | 609 | realtime bandwidth for them. |
| 611 | See Documentation/scheduler/sched-rt-group.txt for more information. | 610 | See Documentation/scheduler/sched-rt-group.txt for more information. |