summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-28 09:46:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-28 09:46:20 -0700
commit8ca6215502462f564d7bcae2d8dcc825aa95d743 (patch)
tree1534f8ad77640ab6f6d9471679b6e4c2d11e739c /Documentation
parentf8245e91a5121acc435e509aa56cd04d445a74c7 (diff)
parent4078e359c4688541a0093fde0dff35dc7190c4f5 (diff)
downloadblackbird-op-linux-8ca6215502462f564d7bcae2d8dcc825aa95d743.tar.gz
blackbird-op-linux-8ca6215502462f564d7bcae2d8dcc825aa95d743.zip
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: sched: fix documentation reference for sched_min_granularity_ns sched: virtual time buddy preemption sched: re-instate vruntime based wakeup preemption sched: weaken sync hint sched: more accurate min_vruntime accounting sched: fix a find_busiest_group buglet sched: add CONFIG_SMP consistency
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/scheduler/sched-design-CFS.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scheduler/sched-design-CFS.txt b/Documentation/scheduler/sched-design-CFS.txt
index 9d8eb553884c..eb471c7a905e 100644
--- a/Documentation/scheduler/sched-design-CFS.txt
+++ b/Documentation/scheduler/sched-design-CFS.txt
@@ -92,7 +92,7 @@ other HZ detail. Thus the CFS scheduler has no notion of "timeslices" in the
way the previous scheduler had, and has no heuristics whatsoever. There is
only one central tunable (you have to switch on CONFIG_SCHED_DEBUG):
- /proc/sys/kernel/sched_granularity_ns
+ /proc/sys/kernel/sched_min_granularity_ns
which can be used to tune the scheduler from "desktop" (i.e., low latencies) to
"server" (i.e., good batching) workloads. It defaults to a setting suitable
OpenPOWER on IntegriCloud