diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 22:42:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 22:42:15 -0400 |
| commit | b2e09f633a3994ee97fa6bc734b533d9c8e6ea0f (patch) | |
| tree | 8f398d3f7ac19a4f4d64862086597f335d977203 /include/trace | |
| parent | 3737a12761636ebde0f09ef49daebb8eed18cc8a (diff) | |
| parent | 535560d841b2d54f31280e05e9c6ffd19da0c4e7 (diff) | |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull more scheduler updates from Ingo Molnar:
"Second round of scheduler changes:
- try-to-wakeup and IPI reduction speedups, from Andy Lutomirski
- continued power scheduling cleanups and refactorings, from Nicolas
Pitre
- misc fixes and enhancements"
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/deadline: Delete extraneous extern for to_ratio()
sched/idle: Optimize try-to-wake-up IPI
sched/idle: Simplify wake_up_idle_cpu()
sched/idle: Clear polling before descheduling the idle thread
sched, trace: Add a tracepoint for IPI-less remote wakeups
cpuidle: Set polling in poll_idle
sched: Remove redundant assignment to "rt_rq" in update_curr_rt(...)
sched: Rename capacity related flags
sched: Final power vs. capacity cleanups
sched: Remove remaining dubious usage of "power"
sched: Let 'struct sched_group_power' care about CPU capacity
sched/fair: Disambiguate existing/remaining "capacity" usage
sched/fair: Change "has_capacity" to "has_free_capacity"
sched/fair: Remove "power" from 'struct numa_stats'
sched: Fix signedness bug in yield_to()
sched/fair: Use time_after() in record_wakee()
sched/balancing: Reduce the rate of needless idle load balancing
sched/fair: Fix unlocked reads of some cfs_b->quota/period
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/sched.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 67e1bbf83695..0a68d5ae584e 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h | |||
| @@ -530,6 +530,26 @@ TRACE_EVENT(sched_swap_numa, | |||
| 530 | __entry->dst_pid, __entry->dst_tgid, __entry->dst_ngid, | 530 | __entry->dst_pid, __entry->dst_tgid, __entry->dst_ngid, |
| 531 | __entry->dst_cpu, __entry->dst_nid) | 531 | __entry->dst_cpu, __entry->dst_nid) |
| 532 | ); | 532 | ); |
| 533 | |||
| 534 | /* | ||
| 535 | * Tracepoint for waking a polling cpu without an IPI. | ||
| 536 | */ | ||
| 537 | TRACE_EVENT(sched_wake_idle_without_ipi, | ||
| 538 | |||
| 539 | TP_PROTO(int cpu), | ||
| 540 | |||
| 541 | TP_ARGS(cpu), | ||
| 542 | |||
| 543 | TP_STRUCT__entry( | ||
| 544 | __field( int, cpu ) | ||
| 545 | ), | ||
| 546 | |||
| 547 | TP_fast_assign( | ||
| 548 | __entry->cpu = cpu; | ||
| 549 | ), | ||
| 550 | |||
| 551 | TP_printk("cpu=%d", __entry->cpu) | ||
| 552 | ); | ||
| 533 | #endif /* _TRACE_SCHED_H */ | 553 | #endif /* _TRACE_SCHED_H */ |
| 534 | 554 | ||
| 535 | /* This part must be outside protection */ | 555 | /* This part must be outside protection */ |
