diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 18:55:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 18:55:48 -0400 |
| commit | acc11eab70591744369722280c9ce162a6193494 (patch) | |
| tree | f23138ad28b557311b6e512f40ec27fbc42481f1 /kernel/sched_features.h | |
| parent | 919d25a710bd6ded210426e911c9f9ec535d8d9c (diff) | |
| parent | d110235d2c331c4f79e0879f51104be79e17a469 (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Avoid creating superfluous NUMA domains on non-NUMA systems
sched: Allow for overlapping sched_domain spans
sched: Break out cpu_power from the sched_group structure
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index be40f7371ee1..1e7066d76c26 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
| @@ -70,3 +70,5 @@ SCHED_FEAT(NONIRQ_POWER, 1) | |||
| 70 | * using the scheduler IPI. Reduces rq->lock contention/bounces. | 70 | * using the scheduler IPI. Reduces rq->lock contention/bounces. |
| 71 | */ | 71 | */ |
| 72 | SCHED_FEAT(TTWU_QUEUE, 1) | 72 | SCHED_FEAT(TTWU_QUEUE, 1) |
| 73 | |||
| 74 | SCHED_FEAT(FORCE_SD_OVERLAP, 0) | ||