diff options
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index 85e8cf7d393c..fc0bf3edeb67 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
| @@ -95,14 +95,12 @@ int arch_update_cpu_topology(void); | |||
| 95 | | 1*SD_BALANCE_NEWIDLE \ | 95 | | 1*SD_BALANCE_NEWIDLE \ |
| 96 | | 1*SD_BALANCE_EXEC \ | 96 | | 1*SD_BALANCE_EXEC \ |
| 97 | | 1*SD_BALANCE_FORK \ | 97 | | 1*SD_BALANCE_FORK \ |
| 98 | | 0*SD_WAKE_IDLE \ | 98 | | 0*SD_BALANCE_WAKE \ |
| 99 | | 1*SD_WAKE_AFFINE \ | 99 | | 1*SD_WAKE_AFFINE \ |
| 100 | | 1*SD_WAKE_BALANCE \ | ||
| 101 | | 1*SD_SHARE_CPUPOWER \ | 100 | | 1*SD_SHARE_CPUPOWER \ |
| 102 | | 0*SD_POWERSAVINGS_BALANCE \ | 101 | | 0*SD_POWERSAVINGS_BALANCE \ |
| 103 | | 0*SD_SHARE_PKG_RESOURCES \ | 102 | | 0*SD_SHARE_PKG_RESOURCES \ |
| 104 | | 0*SD_SERIALIZE \ | 103 | | 0*SD_SERIALIZE \ |
| 105 | | 0*SD_WAKE_IDLE_FAR \ | ||
| 106 | | 0*SD_PREFER_SIBLING \ | 104 | | 0*SD_PREFER_SIBLING \ |
| 107 | , \ | 105 | , \ |
| 108 | .last_balance = jiffies, \ | 106 | .last_balance = jiffies, \ |
| @@ -122,20 +120,19 @@ int arch_update_cpu_topology(void); | |||
| 122 | .imbalance_pct = 125, \ | 120 | .imbalance_pct = 125, \ |
| 123 | .cache_nice_tries = 1, \ | 121 | .cache_nice_tries = 1, \ |
| 124 | .busy_idx = 2, \ | 122 | .busy_idx = 2, \ |
| 125 | .wake_idx = 1, \ | 123 | .wake_idx = 0, \ |
| 126 | .forkexec_idx = 1, \ | 124 | .forkexec_idx = 0, \ |
| 127 | \ | 125 | \ |
| 128 | .flags = 1*SD_LOAD_BALANCE \ | 126 | .flags = 1*SD_LOAD_BALANCE \ |
| 129 | | 1*SD_BALANCE_NEWIDLE \ | 127 | | 1*SD_BALANCE_NEWIDLE \ |
| 130 | | 1*SD_BALANCE_EXEC \ | 128 | | 1*SD_BALANCE_EXEC \ |
| 131 | | 1*SD_BALANCE_FORK \ | 129 | | 1*SD_BALANCE_FORK \ |
| 132 | | 1*SD_WAKE_IDLE \ | 130 | | 0*SD_BALANCE_WAKE \ |
| 133 | | 1*SD_WAKE_AFFINE \ | 131 | | 1*SD_WAKE_AFFINE \ |
| 134 | | 1*SD_WAKE_BALANCE \ | 132 | | 1*SD_PREFER_LOCAL \ |
| 135 | | 0*SD_SHARE_CPUPOWER \ | 133 | | 0*SD_SHARE_CPUPOWER \ |
| 136 | | 1*SD_SHARE_PKG_RESOURCES \ | 134 | | 1*SD_SHARE_PKG_RESOURCES \ |
| 137 | | 0*SD_SERIALIZE \ | 135 | | 0*SD_SERIALIZE \ |
| 138 | | 0*SD_WAKE_IDLE_FAR \ | ||
| 139 | | sd_balance_for_mc_power() \ | 136 | | sd_balance_for_mc_power() \ |
| 140 | | sd_power_saving_flags() \ | 137 | | sd_power_saving_flags() \ |
| 141 | , \ | 138 | , \ |
| @@ -155,21 +152,20 @@ int arch_update_cpu_topology(void); | |||
| 155 | .cache_nice_tries = 1, \ | 152 | .cache_nice_tries = 1, \ |
| 156 | .busy_idx = 2, \ | 153 | .busy_idx = 2, \ |
| 157 | .idle_idx = 1, \ | 154 | .idle_idx = 1, \ |
| 158 | .newidle_idx = 2, \ | 155 | .newidle_idx = 0, \ |
| 159 | .wake_idx = 1, \ | 156 | .wake_idx = 0, \ |
| 160 | .forkexec_idx = 1, \ | 157 | .forkexec_idx = 0, \ |
| 161 | \ | 158 | \ |
| 162 | .flags = 1*SD_LOAD_BALANCE \ | 159 | .flags = 1*SD_LOAD_BALANCE \ |
| 163 | | 1*SD_BALANCE_NEWIDLE \ | 160 | | 1*SD_BALANCE_NEWIDLE \ |
| 164 | | 1*SD_BALANCE_EXEC \ | 161 | | 1*SD_BALANCE_EXEC \ |
| 165 | | 1*SD_BALANCE_FORK \ | 162 | | 1*SD_BALANCE_FORK \ |
| 166 | | 1*SD_WAKE_IDLE \ | 163 | | 0*SD_BALANCE_WAKE \ |
| 167 | | 0*SD_WAKE_AFFINE \ | 164 | | 1*SD_WAKE_AFFINE \ |
| 168 | | 1*SD_WAKE_BALANCE \ | 165 | | 1*SD_PREFER_LOCAL \ |
| 169 | | 0*SD_SHARE_CPUPOWER \ | 166 | | 0*SD_SHARE_CPUPOWER \ |
| 170 | | 0*SD_SHARE_PKG_RESOURCES \ | 167 | | 0*SD_SHARE_PKG_RESOURCES \ |
| 171 | | 0*SD_SERIALIZE \ | 168 | | 0*SD_SERIALIZE \ |
| 172 | | 0*SD_WAKE_IDLE_FAR \ | ||
| 173 | | sd_balance_for_package_power() \ | 169 | | sd_balance_for_package_power() \ |
| 174 | | sd_power_saving_flags() \ | 170 | | sd_power_saving_flags() \ |
| 175 | , \ | 171 | , \ |
| @@ -191,14 +187,12 @@ int arch_update_cpu_topology(void); | |||
| 191 | | 1*SD_BALANCE_NEWIDLE \ | 187 | | 1*SD_BALANCE_NEWIDLE \ |
| 192 | | 0*SD_BALANCE_EXEC \ | 188 | | 0*SD_BALANCE_EXEC \ |
| 193 | | 0*SD_BALANCE_FORK \ | 189 | | 0*SD_BALANCE_FORK \ |
| 194 | | 0*SD_WAKE_IDLE \ | 190 | | 0*SD_BALANCE_WAKE \ |
| 195 | | 1*SD_WAKE_AFFINE \ | 191 | | 0*SD_WAKE_AFFINE \ |
| 196 | | 0*SD_WAKE_BALANCE \ | ||
| 197 | | 0*SD_SHARE_CPUPOWER \ | 192 | | 0*SD_SHARE_CPUPOWER \ |
| 198 | | 0*SD_POWERSAVINGS_BALANCE \ | 193 | | 0*SD_POWERSAVINGS_BALANCE \ |
| 199 | | 0*SD_SHARE_PKG_RESOURCES \ | 194 | | 0*SD_SHARE_PKG_RESOURCES \ |
| 200 | | 1*SD_SERIALIZE \ | 195 | | 1*SD_SERIALIZE \ |
| 201 | | 1*SD_WAKE_IDLE_FAR \ | ||
| 202 | | 0*SD_PREFER_SIBLING \ | 196 | | 0*SD_PREFER_SIBLING \ |
| 203 | , \ | 197 | , \ |
| 204 | .last_balance = jiffies, \ | 198 | .last_balance = jiffies, \ |
| @@ -217,12 +211,6 @@ int arch_update_cpu_topology(void); | |||
| 217 | #ifndef topology_core_id | 211 | #ifndef topology_core_id |
| 218 | #define topology_core_id(cpu) ((void)(cpu), 0) | 212 | #define topology_core_id(cpu) ((void)(cpu), 0) |
| 219 | #endif | 213 | #endif |
| 220 | #ifndef topology_thread_siblings | ||
| 221 | #define topology_thread_siblings(cpu) cpumask_of_cpu(cpu) | ||
| 222 | #endif | ||
| 223 | #ifndef topology_core_siblings | ||
| 224 | #define topology_core_siblings(cpu) cpumask_of_cpu(cpu) | ||
| 225 | #endif | ||
| 226 | #ifndef topology_thread_cpumask | 214 | #ifndef topology_thread_cpumask |
| 227 | #define topology_thread_cpumask(cpu) cpumask_of(cpu) | 215 | #define topology_thread_cpumask(cpu) cpumask_of(cpu) |
| 228 | #endif | 216 | #endif |