diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 11:06:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 11:06:21 -0500 |
| commit | 8c60bfb0666952728b3be73ef9bc133d686aebba (patch) | |
| tree | d532c12f7e414ee3ce6ed3bda912fa145e96de29 /init/Kconfig | |
| parent | b6584065ee833dcec20683be7fc25da3f2268cee (diff) | |
| parent | 700018e0a77b4113172257fcdaa1c58e27a5074f (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
cpuset: fix regression when failed to generate sched domains
sched, signals: fix the racy usage of ->signal in account_group_xxx/run_posix_cpu_timers
sched: fix kernel warning on /proc/sched_debug access
sched: correct sched-rt-group.txt pathname in init/Kconfig
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 226da2733c1e..f763762d544a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -354,7 +354,7 @@ config RT_GROUP_SCHED | |||
| 354 | setting below. If enabled, it will also make it impossible to | 354 | setting below. If enabled, it will also make it impossible to |
| 355 | schedule realtime tasks for non-root users until you allocate | 355 | schedule realtime tasks for non-root users until you allocate |
| 356 | realtime bandwidth for them. | 356 | realtime bandwidth for them. |
| 357 | See Documentation/sched-rt-group.txt for more information. | 357 | See Documentation/scheduler/sched-rt-group.txt for more information. |
| 358 | 358 | ||
| 359 | choice | 359 | choice |
| 360 | depends on GROUP_SCHED | 360 | depends on GROUP_SCHED |