summaryrefslogtreecommitdiffstats
path: root/Documentation/scheduler/sched-design-CFS.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-31 08:17:34 +0100
committerDavid S. Miller <davem@davemloft.net>2008-10-31 08:17:34 +0100
commita1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch)
treec0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /Documentation/scheduler/sched-design-CFS.txt
parentpci: use pci_ioremap_bar() in drivers/net (diff)
parentxfrm: do not leak ESRCH to user space (diff)
downloadlinux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.tar.xz
linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'Documentation/scheduler/sched-design-CFS.txt')
-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