diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 14:21:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 14:21:19 -0400 |
| commit | 971eae7c99212dd67b425a603f1fe3b763359907 (patch) | |
| tree | 2ff002ecc759275cbecee123a230f90ea7452b18 /arch/ia64 | |
| parent | 8c292f11744297dfb3a69f4a0bccbe4a6417b50d (diff) | |
| parent | 6037dd1a49f95092824fa8ba75c717ff7805e317 (diff) | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler changes from Ingo Molnar:
"Bigger changes:
- sched/idle restructuring: they are WIP preparation for deeper
integration between the scheduler and idle state selection, by
Nicolas Pitre.
- add NUMA scheduling pseudo-interleaving, by Rik van Riel.
- optimize cgroup context switches, by Peter Zijlstra.
- RT scheduling enhancements, by Thomas Gleixner.
The rest is smaller changes, non-urgnt fixes and cleanups"
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (68 commits)
sched: Clean up the task_hot() function
sched: Remove double calculation in fix_small_imbalance()
sched: Fix broken setscheduler()
sparc64, sched: Remove unused sparc64_multi_core
sched: Remove unused mc_capable() and smt_capable()
sched/numa: Move task_numa_free() to __put_task_struct()
sched/fair: Fix endless loop in idle_balance()
sched/core: Fix endless loop in pick_next_task()
sched/fair: Push down check for high priority class task into idle_balance()
sched/rt: Fix picking RT and DL tasks from empty queue
trace: Replace hardcoding of 19 with MAX_NICE
sched: Guarantee task priority in pick_next_task()
sched/idle: Remove stale old file
sched: Put rq's sched_avg under CONFIG_FAIR_GROUP_SCHED
cpuidle/arm64: Remove redundant cpuidle_idle_call()
cpuidle/powernv: Remove redundant cpuidle_idle_call()
sched, nohz: Exclude isolated cores from load balancing
sched: Fix select_task_rq_fair() description comments
workqueue: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
sys: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
...
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index a2496e449b75..5cb55a1e606b 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h | |||
| @@ -77,7 +77,6 @@ void build_cpu_to_node_map(void); | |||
| 77 | #define topology_core_id(cpu) (cpu_data(cpu)->core_id) | 77 | #define topology_core_id(cpu) (cpu_data(cpu)->core_id) |
| 78 | #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) | 78 | #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) |
| 79 | #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) | 79 | #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) |
| 80 | #define smt_capable() (smp_num_siblings > 1) | ||
| 81 | #endif | 80 | #endif |
| 82 | 81 | ||
| 83 | extern void arch_fix_phys_package_id(int num, u32 slot); | 82 | extern void arch_fix_phys_package_id(int num, u32 slot); |