diff --git a/[refs] b/[refs] index 85f0f70fe5f2..effae32235ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4301065920b0cbde3986519582347e883b166f3e +refs/heads/master: 5f5d3aa15bb24a4d5d195bd32d549bd725d414bc diff --git a/trunk/Documentation/sched-design-CFS.txt b/trunk/Documentation/sched-design-CFS.txt index 16feebb7bdc0..84901e7c0508 100644 --- a/trunk/Documentation/sched-design-CFS.txt +++ b/trunk/Documentation/sched-design-CFS.txt @@ -83,7 +83,7 @@ Some implementation details: CFS uses nanosecond granularity accounting and does not rely on any jiffies or other HZ detail. Thus the CFS scheduler has no notion of 'timeslices' and has no heuristics whatsoever. There is only one - central tunable: + central tunable (you have to switch on CONFIG_SCHED_DEBUG): /proc/sys/kernel/sched_granularity_ns