diff options
| author | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /kernel/sched_features.h | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 7c9e8f4a049f..fda016218296 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
| @@ -5,7 +5,7 @@ SCHED_FEAT(START_DEBIT, 1) | |||
| 5 | SCHED_FEAT(AFFINE_WAKEUPS, 1) | 5 | SCHED_FEAT(AFFINE_WAKEUPS, 1) |
| 6 | SCHED_FEAT(CACHE_HOT_BUDDY, 1) | 6 | SCHED_FEAT(CACHE_HOT_BUDDY, 1) |
| 7 | SCHED_FEAT(SYNC_WAKEUPS, 1) | 7 | SCHED_FEAT(SYNC_WAKEUPS, 1) |
| 8 | SCHED_FEAT(HRTICK, 1) | 8 | SCHED_FEAT(HRTICK, 0) |
| 9 | SCHED_FEAT(DOUBLE_TICK, 0) | 9 | SCHED_FEAT(DOUBLE_TICK, 0) |
| 10 | SCHED_FEAT(ASYM_GRAN, 1) | 10 | SCHED_FEAT(ASYM_GRAN, 1) |
| 11 | SCHED_FEAT(LB_BIAS, 1) | 11 | SCHED_FEAT(LB_BIAS, 1) |