diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-20 16:10:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 16:10:22 -0400 |
| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 (patch) | |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 /kernel/sched_features.h | |
| parent | 9fafbd806198eb690c9a9f9fe35a879db93a1b8d (diff) | |
| parent | 317f394160e9beb97d19a84c39b7e5eb3d7815a8 (diff) | |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sched_features.h')
| -rw-r--r-- | kernel/sched_features.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 68e69acc29b9..be40f7371ee1 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
| @@ -64,3 +64,9 @@ SCHED_FEAT(OWNER_SPIN, 1) | |||
| 64 | * Decrement CPU power based on irq activity | 64 | * Decrement CPU power based on irq activity |
| 65 | */ | 65 | */ |
| 66 | SCHED_FEAT(NONIRQ_POWER, 1) | 66 | SCHED_FEAT(NONIRQ_POWER, 1) |
| 67 | |||
| 68 | /* | ||
| 69 | * Queue remote wakeups on the target CPU and process them | ||
| 70 | * using the scheduler IPI. Reduces rq->lock contention/bounces. | ||
| 71 | */ | ||
| 72 | SCHED_FEAT(TTWU_QUEUE, 1) | ||