diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-09-03 07:16:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 10:01:07 -0400 |
| commit | 78e7ed53c9f42f04f9401ada6f7047db60781676 (patch) | |
| tree | 24f45333ce4479b27c96b425c7d09c080a26609f /arch | |
| parent | d7c33c4930f569caf6b2ece597432853c4151a45 (diff) | |
sched: Tweak wake_idx
When merging select_task_rq_fair() and sched_balance_self() we lost
the use of wake_idx, restore that and set them to 0 to make wake
balancing more aggressive.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 5 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/topology.h | 3 | ||||
| -rw-r--r-- | arch/sh/include/asm/topology.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/topology_64.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/topology.h | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index cf6053b226c3..47f3c51d5e27 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
| @@ -62,11 +62,12 @@ void build_cpu_to_node_map(void); | |||
| 62 | .busy_idx = 2, \ | 62 | .busy_idx = 2, \ |
| 63 | .idle_idx = 1, \ | 63 | .idle_idx = 1, \ |
| 64 | .newidle_idx = 2, \ | 64 | .newidle_idx = 2, \ |
| 65 | .wake_idx = 1, \ | 65 | .wake_idx = 0, \ |
| 66 | .forkexec_idx = 1, \ | 66 | .forkexec_idx = 1, \ |
| 67 | .flags = SD_LOAD_BALANCE \ | 67 | .flags = SD_LOAD_BALANCE \ |
| 68 | | SD_BALANCE_NEWIDLE \ | 68 | | SD_BALANCE_NEWIDLE \ |
| 69 | | SD_BALANCE_EXEC \ | 69 | | SD_BALANCE_EXEC \ |
| 70 | | SD_BALANCE_FORK \ | ||
| 70 | | SD_BALANCE_WAKE \ | 71 | | SD_BALANCE_WAKE \ |
| 71 | | SD_WAKE_AFFINE, \ | 72 | | SD_WAKE_AFFINE, \ |
| 72 | .last_balance = jiffies, \ | 73 | .last_balance = jiffies, \ |
| @@ -87,7 +88,7 @@ void build_cpu_to_node_map(void); | |||
| 87 | .busy_idx = 3, \ | 88 | .busy_idx = 3, \ |
| 88 | .idle_idx = 2, \ | 89 | .idle_idx = 2, \ |
| 89 | .newidle_idx = 2, \ | 90 | .newidle_idx = 2, \ |
| 90 | .wake_idx = 1, \ | 91 | .wake_idx = 0, \ |
| 91 | .forkexec_idx = 1, \ | 92 | .forkexec_idx = 1, \ |
| 92 | .flags = SD_LOAD_BALANCE \ | 93 | .flags = SD_LOAD_BALANCE \ |
| 93 | | SD_BALANCE_EXEC \ | 94 | | SD_BALANCE_EXEC \ |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index c6343313ff59..a6b220ab56db 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
| @@ -58,9 +58,10 @@ static inline int pcibus_to_node(struct pci_bus *bus) | |||
| 58 | .busy_idx = 3, \ | 58 | .busy_idx = 3, \ |
| 59 | .idle_idx = 1, \ | 59 | .idle_idx = 1, \ |
| 60 | .newidle_idx = 2, \ | 60 | .newidle_idx = 2, \ |
| 61 | .wake_idx = 1, \ | 61 | .wake_idx = 0, \ |
| 62 | .flags = SD_LOAD_BALANCE \ | 62 | .flags = SD_LOAD_BALANCE \ |
| 63 | | SD_BALANCE_EXEC \ | 63 | | SD_BALANCE_EXEC \ |
| 64 | | SD_BALANCE_FORK \ | ||
| 64 | | SD_BALANCE_NEWIDLE \ | 65 | | SD_BALANCE_NEWIDLE \ |
| 65 | | SD_BALANCE_WAKE \ | 66 | | SD_BALANCE_WAKE \ |
| 66 | | SD_SERIALIZE, \ | 67 | | SD_SERIALIZE, \ |
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index dc1531e2f25f..9054e5c0ad54 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | .busy_idx = 3, \ | 16 | .busy_idx = 3, \ |
| 17 | .idle_idx = 2, \ | 17 | .idle_idx = 2, \ |
| 18 | .newidle_idx = 2, \ | 18 | .newidle_idx = 2, \ |
| 19 | .wake_idx = 1, \ | 19 | .wake_idx = 0, \ |
| 20 | .forkexec_idx = 1, \ | 20 | .forkexec_idx = 1, \ |
| 21 | .flags = SD_LOAD_BALANCE \ | 21 | .flags = SD_LOAD_BALANCE \ |
| 22 | | SD_BALANCE_FORK \ | 22 | | SD_BALANCE_FORK \ |
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 1d091abd2d13..bc3a0930ed64 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h | |||
| @@ -52,7 +52,7 @@ static inline int pcibus_to_node(struct pci_bus *pbus) | |||
| 52 | .busy_idx = 3, \ | 52 | .busy_idx = 3, \ |
| 53 | .idle_idx = 2, \ | 53 | .idle_idx = 2, \ |
| 54 | .newidle_idx = 0, \ | 54 | .newidle_idx = 0, \ |
| 55 | .wake_idx = 1, \ | 55 | .wake_idx = 0, \ |
| 56 | .forkexec_idx = 1, \ | 56 | .forkexec_idx = 1, \ |
| 57 | .flags = SD_LOAD_BALANCE \ | 57 | .flags = SD_LOAD_BALANCE \ |
| 58 | | SD_BALANCE_FORK \ | 58 | | SD_BALANCE_FORK \ |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 966d58dc6274..4b1b335097b5 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -138,7 +138,7 @@ extern unsigned long node_remap_size[]; | |||
| 138 | .busy_idx = 3, \ | 138 | .busy_idx = 3, \ |
| 139 | .idle_idx = SD_IDLE_IDX, \ | 139 | .idle_idx = SD_IDLE_IDX, \ |
| 140 | .newidle_idx = SD_NEWIDLE_IDX, \ | 140 | .newidle_idx = SD_NEWIDLE_IDX, \ |
| 141 | .wake_idx = 1, \ | 141 | .wake_idx = 0, \ |
| 142 | .forkexec_idx = SD_FORKEXEC_IDX, \ | 142 | .forkexec_idx = SD_FORKEXEC_IDX, \ |
| 143 | \ | 143 | \ |
| 144 | .flags = 1*SD_LOAD_BALANCE \ | 144 | .flags = 1*SD_LOAD_BALANCE \ |