diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /arch/x86/include/asm/topology.h | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/include/asm/topology.h')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 066ef590d7e0..6f0695d744bf 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -116,38 +116,41 @@ 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 | ||
| 121 | 119 | ||
| 122 | #else | 120 | #else |
| 123 | 121 | ||
| 124 | # define SD_CACHE_NICE_TRIES 2 | 122 | # define SD_CACHE_NICE_TRIES 2 |
| 125 | # define SD_IDLE_IDX 2 | 123 | # define SD_IDLE_IDX 2 |
| 126 | # define SD_NEWIDLE_IDX 2 | ||
| 127 | # define SD_FORKEXEC_IDX 1 | ||
| 128 | 124 | ||
| 129 | #endif | 125 | #endif |
| 130 | 126 | ||
| 131 | /* sched_domains SD_NODE_INIT for NUMA machines */ | 127 | /* sched_domains SD_NODE_INIT for NUMA machines */ |
| 132 | #define SD_NODE_INIT (struct sched_domain) { \ | 128 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 133 | .min_interval = 8, \ | 129 | .min_interval = 8, \ |
| 134 | .max_interval = 32, \ | 130 | .max_interval = 32, \ |
| 135 | .busy_factor = 32, \ | 131 | .busy_factor = 32, \ |
| 136 | .imbalance_pct = 125, \ | 132 | .imbalance_pct = 125, \ |
| 137 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ | 133 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ |
| 138 | .busy_idx = 3, \ | 134 | .busy_idx = 3, \ |
| 139 | .idle_idx = SD_IDLE_IDX, \ | 135 | .idle_idx = SD_IDLE_IDX, \ |
| 140 | .newidle_idx = SD_NEWIDLE_IDX, \ | 136 | .newidle_idx = 0, \ |
| 141 | .wake_idx = 1, \ | 137 | .wake_idx = 0, \ |
| 142 | .forkexec_idx = SD_FORKEXEC_IDX, \ | 138 | .forkexec_idx = 0, \ |
| 143 | .flags = SD_LOAD_BALANCE \ | 139 | \ |
| 144 | | SD_BALANCE_EXEC \ | 140 | .flags = 1*SD_LOAD_BALANCE \ |
| 145 | | SD_BALANCE_FORK \ | 141 | | 1*SD_BALANCE_NEWIDLE \ |
| 146 | | SD_WAKE_AFFINE \ | 142 | | 1*SD_BALANCE_EXEC \ |
| 147 | | SD_WAKE_BALANCE \ | 143 | | 1*SD_BALANCE_FORK \ |
| 148 | | SD_SERIALIZE, \ | 144 | | 0*SD_BALANCE_WAKE \ |
| 149 | .last_balance = jiffies, \ | 145 | | 1*SD_WAKE_AFFINE \ |
| 150 | .balance_interval = 1, \ | 146 | | 0*SD_SHARE_CPUPOWER \ |
| 147 | | 0*SD_POWERSAVINGS_BALANCE \ | ||
| 148 | | 0*SD_SHARE_PKG_RESOURCES \ | ||
| 149 | | 1*SD_SERIALIZE \ | ||
| 150 | | 0*SD_PREFER_SIBLING \ | ||
| 151 | , \ | ||
| 152 | .last_balance = jiffies, \ | ||
| 153 | .balance_interval = 1, \ | ||
| 151 | } | 154 | } |
| 152 | 155 | ||
| 153 | #ifdef CONFIG_X86_64_ACPI_NUMA | 156 | #ifdef CONFIG_X86_64_ACPI_NUMA |