diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /kernel/sched_features.h | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 185f920ec1a2..68e69acc29b9 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
| @@ -52,8 +52,6 @@ SCHED_FEAT(ARCH_POWER, 0) | |||
| 52 | SCHED_FEAT(HRTICK, 0) | 52 | SCHED_FEAT(HRTICK, 0) |
| 53 | SCHED_FEAT(DOUBLE_TICK, 0) | 53 | SCHED_FEAT(DOUBLE_TICK, 0) |
| 54 | SCHED_FEAT(LB_BIAS, 1) | 54 | SCHED_FEAT(LB_BIAS, 1) |
| 55 | SCHED_FEAT(LB_SHARES_UPDATE, 1) | ||
| 56 | SCHED_FEAT(ASYM_EFF_LOAD, 1) | ||
| 57 | 55 | ||
| 58 | /* | 56 | /* |
| 59 | * Spin-wait on mutex acquisition when the mutex owner is running on | 57 | * Spin-wait on mutex acquisition when the mutex owner is running on |