diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
| commit | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (patch) | |
| tree | 38cead29b9b34b9d26b5cfe7b2c2673d6f7ac052 /kernel/sched_features.h | |
| parent | d59fdcf2ac501de99c3dfb452af5e254d4342886 (diff) | |
| parent | 873a6ed6288b6c2c0d2cc84d3b2bf2fab9ba0181 (diff) | |
| download | blackbird-op-linux-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.tar.gz blackbird-op-linux-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.zip | |
Merge branch 'sched/for-linus' into tracing/for-linus
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 1c7283cb9581..862b06bd560a 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h @@ -1,4 +1,5 @@ SCHED_FEAT(NEW_FAIR_SLEEPERS, 1) +SCHED_FEAT(NORMALIZED_SLEEPER, 1) SCHED_FEAT(WAKEUP_PREEMPT, 1) SCHED_FEAT(START_DEBIT, 1) SCHED_FEAT(AFFINE_WAKEUPS, 1) @@ -6,5 +7,7 @@ SCHED_FEAT(CACHE_HOT_BUDDY, 1) SCHED_FEAT(SYNC_WAKEUPS, 1) SCHED_FEAT(HRTICK, 1) SCHED_FEAT(DOUBLE_TICK, 0) -SCHED_FEAT(NORMALIZED_SLEEPER, 1) -SCHED_FEAT(DEADLINE, 1) +SCHED_FEAT(ASYM_GRAN, 1) +SCHED_FEAT(LB_BIAS, 0) +SCHED_FEAT(LB_WAKEUP_UPDATE, 1) +SCHED_FEAT(ASYM_EFF_LOAD, 1) |
