diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:23:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:23:18 -0400 |
| commit | 774a694f8cd08115d130a290d73c6d8563f26b1b (patch) | |
| tree | 2b5f834ac7a149278d2a7e44d7afe69f40ef1431 /arch | |
| parent | 4f0ac854167846bd55cd81dbc9a36e03708aa01c (diff) | |
| parent | e1f8450854d69f0291882804406ea1bab3ca44b4 (diff) | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (64 commits)
sched: Fix sched::sched_stat_wait tracepoint field
sched: Disable NEW_FAIR_SLEEPERS for now
sched: Keep kthreads at default priority
sched: Re-tune the scheduler latency defaults to decrease worst-case latencies
sched: Turn off child_runs_first
sched: Ensure that a child can't gain time over it's parent after fork()
sched: enable SD_WAKE_IDLE
sched: Deal with low-load in wake_affine()
sched: Remove short cut from select_task_rq_fair()
sched: Turn on SD_BALANCE_NEWIDLE
sched: Clean up topology.h
sched: Fix dynamic power-balancing crash
sched: Remove reciprocal for cpu_power
sched: Try to deal with low capacity, fix update_sd_power_savings_stats()
sched: Try to deal with low capacity
sched: Scale down cpu_power due to RT tasks
sched: Implement dynamic cpu_power
sched: Add smt_gain
sched: Update the cpu_power sum during load-balance
sched: Add SD_PREFER_SIBLING
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 066ef590d7e0..26d06e052a18 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -129,25 +129,34 @@ extern unsigned long node_remap_size[]; | |||
| 129 | #endif | 129 | #endif |
| 130 | 130 | ||
| 131 | /* sched_domains SD_NODE_INIT for NUMA machines */ | 131 | /* sched_domains SD_NODE_INIT for NUMA machines */ |
| 132 | #define SD_NODE_INIT (struct sched_domain) { \ | 132 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 133 | .min_interval = 8, \ | 133 | .min_interval = 8, \ |
| 134 | .max_interval = 32, \ | 134 | .max_interval = 32, \ |
| 135 | .busy_factor = 32, \ | 135 | .busy_factor = 32, \ |
| 136 | .imbalance_pct = 125, \ | 136 | .imbalance_pct = 125, \ |
| 137 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ | 137 | .cache_nice_tries = SD_CACHE_NICE_TRIES, \ |
| 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 = 1, \ |
| 142 | .forkexec_idx = SD_FORKEXEC_IDX, \ | 142 | .forkexec_idx = SD_FORKEXEC_IDX, \ |
| 143 | .flags = SD_LOAD_BALANCE \ | 143 | \ |
| 144 | | SD_BALANCE_EXEC \ | 144 | .flags = 1*SD_LOAD_BALANCE \ |
| 145 | | SD_BALANCE_FORK \ | 145 | | 1*SD_BALANCE_NEWIDLE \ |
| 146 | | SD_WAKE_AFFINE \ | 146 | | 1*SD_BALANCE_EXEC \ |
| 147 | | SD_WAKE_BALANCE \ | 147 | | 1*SD_BALANCE_FORK \ |
| 148 | | SD_SERIALIZE, \ | 148 | | 0*SD_WAKE_IDLE \ |
| 149 | .last_balance = jiffies, \ | 149 | | 1*SD_WAKE_AFFINE \ |
| 150 | .balance_interval = 1, \ | 150 | | 1*SD_WAKE_BALANCE \ |
| 151 | | 0*SD_SHARE_CPUPOWER \ | ||
| 152 | | 0*SD_POWERSAVINGS_BALANCE \ | ||
| 153 | | 0*SD_SHARE_PKG_RESOURCES \ | ||
| 154 | | 1*SD_SERIALIZE \ | ||
| 155 | | 1*SD_WAKE_IDLE_FAR \ | ||
| 156 | | 0*SD_PREFER_SIBLING \ | ||
| 157 | , \ | ||
| 158 | .last_balance = jiffies, \ | ||
| 159 | .balance_interval = 1, \ | ||
| 151 | } | 160 | } |
| 152 | 161 | ||
| 153 | #ifdef CONFIG_X86_64_ACPI_NUMA | 162 | #ifdef CONFIG_X86_64_ACPI_NUMA |