diff options
-rw-r--r-- | arch/ia64/include/asm/topology.h | 5 | ||||
-rw-r--r-- | arch/powerpc/include/asm/topology.h | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/topology.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/topology.h | 4 | ||||
-rw-r--r-- | include/linux/topology.h | 2 | ||||
-rw-r--r-- | kernel/sched_features.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 47f3c51d5e27..42f1673ec83f 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
@@ -61,7 +61,7 @@ void build_cpu_to_node_map(void); | |||
61 | .cache_nice_tries = 2, \ | 61 | .cache_nice_tries = 2, \ |
62 | .busy_idx = 2, \ | 62 | .busy_idx = 2, \ |
63 | .idle_idx = 1, \ | 63 | .idle_idx = 1, \ |
64 | .newidle_idx = 2, \ | 64 | .newidle_idx = 0, \ |
65 | .wake_idx = 0, \ | 65 | .wake_idx = 0, \ |
66 | .forkexec_idx = 1, \ | 66 | .forkexec_idx = 1, \ |
67 | .flags = SD_LOAD_BALANCE \ | 67 | .flags = SD_LOAD_BALANCE \ |
@@ -87,10 +87,11 @@ void build_cpu_to_node_map(void); | |||
87 | .cache_nice_tries = 2, \ | 87 | .cache_nice_tries = 2, \ |
88 | .busy_idx = 3, \ | 88 | .busy_idx = 3, \ |
89 | .idle_idx = 2, \ | 89 | .idle_idx = 2, \ |
90 | .newidle_idx = 2, \ | 90 | .newidle_idx = 0, \ |
91 | .wake_idx = 0, \ | 91 | .wake_idx = 0, \ |
92 | .forkexec_idx = 1, \ | 92 | .forkexec_idx = 1, \ |
93 | .flags = SD_LOAD_BALANCE \ | 93 | .flags = SD_LOAD_BALANCE \ |
94 | | SD_BALANCE_NEWIDLE \ | ||
94 | | SD_BALANCE_EXEC \ | 95 | | SD_BALANCE_EXEC \ |
95 | | SD_BALANCE_FORK \ | 96 | | SD_BALANCE_FORK \ |
96 | | SD_BALANCE_WAKE \ | 97 | | SD_BALANCE_WAKE \ |
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index a6b220ab56db..1a2c9eb42a03 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h | |||
@@ -57,7 +57,7 @@ static inline int pcibus_to_node(struct pci_bus *bus) | |||
57 | .cache_nice_tries = 1, \ | 57 | .cache_nice_tries = 1, \ |
58 | .busy_idx = 3, \ | 58 | .busy_idx = 3, \ |
59 | .idle_idx = 1, \ | 59 | .idle_idx = 1, \ |
60 | .newidle_idx = 2, \ | 60 | .newidle_idx = 0, \ |
61 | .wake_idx = 0, \ | 61 | .wake_idx = 0, \ |
62 | .flags = SD_LOAD_BALANCE \ | 62 | .flags = SD_LOAD_BALANCE \ |
63 | | SD_BALANCE_EXEC \ | 63 | | SD_BALANCE_EXEC \ |
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index 9054e5c0ad54..c8436771e31d 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h | |||
@@ -15,13 +15,14 @@ | |||
15 | .cache_nice_tries = 2, \ | 15 | .cache_nice_tries = 2, \ |
16 | .busy_idx = 3, \ | 16 | .busy_idx = 3, \ |
17 | .idle_idx = 2, \ | 17 | .idle_idx = 2, \ |
18 | .newidle_idx = 2, \ | 18 | .newidle_idx = 0, \ |
19 | .wake_idx = 0, \ | 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 \ |
23 | | SD_BALANCE_EXEC \ | 23 | | SD_BALANCE_EXEC \ |
24 | | SD_BALANCE_WAKE \ | 24 | | SD_BALANCE_WAKE \ |
25 | | SD_BALANCE_NEWIDLE \ | ||
25 | | SD_SERIALIZE, \ | 26 | | SD_SERIALIZE, \ |
26 | .last_balance = jiffies, \ | 27 | .last_balance = jiffies, \ |
27 | .balance_interval = 1, \ | 28 | .balance_interval = 1, \ |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4b1b335097b5..7fafd1bc4149 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
@@ -116,14 +116,12 @@ extern unsigned long node_remap_size[]; | |||
116 | 116 | ||
117 | # define SD_CACHE_NICE_TRIES 1 | 117 | # define SD_CACHE_NICE_TRIES 1 |
118 | # define SD_IDLE_IDX 1 | 118 | # define SD_IDLE_IDX 1 |
119 | # define SD_NEWIDLE_IDX 2 | ||
120 | # define SD_FORKEXEC_IDX 0 | 119 | # define SD_FORKEXEC_IDX 0 |
121 | 120 | ||
122 | #else | 121 | #else |
123 | 122 | ||
124 | # define SD_CACHE_NICE_TRIES 2 | 123 | # define SD_CACHE_NICE_TRIES 2 |
125 | # define SD_IDLE_IDX 2 | 124 | # define SD_IDLE_IDX 2 |
126 | # define SD_NEWIDLE_IDX 2 | ||
127 | # define SD_FORKEXEC_IDX 1 | 125 | # define SD_FORKEXEC_IDX 1 |
128 | 126 | ||
129 | #endif | 127 | #endif |
@@ -137,7 +135,7 @@ extern unsigned long node_remap_size[]; | |||
137 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ | 135 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ |
138 | .busy_idx = 3, \ | 136 | .busy_idx = 3, \ |
139 | .idle_idx = SD_IDLE_IDX, \ | 137 | .idle_idx = SD_IDLE_IDX, \ |
140 | .newidle_idx = SD_NEWIDLE_IDX, \ | 138 | .newidle_idx = 0, \ |
141 | .wake_idx = 0, \ | 139 | .wake_idx = 0, \ |
142 | .forkexec_idx = SD_FORKEXEC_IDX, \ | 140 | .forkexec_idx = SD_FORKEXEC_IDX, \ |
143 | \ | 141 | \ |
diff --git a/include/linux/topology.h b/include/linux/topology.h index c87edcd87967..4298745615a5 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
@@ -151,7 +151,7 @@ int arch_update_cpu_topology(void); | |||
151 | .cache_nice_tries = 1, \ | 151 | .cache_nice_tries = 1, \ |
152 | .busy_idx = 2, \ | 152 | .busy_idx = 2, \ |
153 | .idle_idx = 1, \ | 153 | .idle_idx = 1, \ |
154 | .newidle_idx = 2, \ | 154 | .newidle_idx = 0, \ |
155 | .wake_idx = 0, \ | 155 | .wake_idx = 0, \ |
156 | .forkexec_idx = 1, \ | 156 | .forkexec_idx = 1, \ |
157 | \ | 157 | \ |
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 891ea0f72b46..e98c2e8de1d5 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
@@ -67,7 +67,7 @@ SCHED_FEAT(AFFINE_WAKEUPS, 1) | |||
67 | * wakeup-preemption), since its likely going to consume data we | 67 | * wakeup-preemption), since its likely going to consume data we |
68 | * touched, increases cache locality. | 68 | * touched, increases cache locality. |
69 | */ | 69 | */ |
70 | SCHED_FEAT(NEXT_BUDDY, 1) | 70 | SCHED_FEAT(NEXT_BUDDY, 0) |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Prefer to schedule the task that ran last (when we did | 73 | * Prefer to schedule the task that ran last (when we did |