diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:51 -0700 |
| commit | 39d112100e561686ab1e2b19c57984163ad6c1fa (patch) | |
| tree | 19b3cd50345306de6f95b58b4a35e8f725786b9b /include/trace | |
| parent | 167b7129042a4b4c09bb4ede5482ff79340a3999 (diff) | |
| parent | 02f726949f2be0967aa4871dd4e47d3967779b26 (diff) | |
| download | linux-stable-39d112100e561686ab1e2b19c57984163ad6c1fa.tar.gz linux-stable-39d112100e561686ab1e2b19c57984163ad6c1fa.tar.bz2 linux-stable-39d112100e561686ab1e2b19c57984163ad6c1fa.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched, trace: Fix sched_switch() prev_state argument
sched: Fix wake_affine() vs RT tasks
sched: Make sure timers have migrated before killing the migration_thread
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/sched.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 4f733ecea46e..b9e1dd6c6208 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -115,6 +115,23 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new, TP_PROTO(struct task_struct *p, int success), TP_ARGS(p, success)); +#ifdef CREATE_TRACE_POINTS +static inline long __trace_sched_switch_state(struct task_struct *p) +{ + long state = p->state; + +#ifdef CONFIG_PREEMPT + /* + * For all intents and purposes a preempted task is a running task. + */ + if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE) + state = TASK_RUNNING; +#endif + + return state; +} +#endif + /* * Tracepoint for task switches, performed by the scheduler: */ @@ -139,7 +156,7 @@ TRACE_EVENT(sched_switch, memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); __entry->prev_pid = prev->pid; __entry->prev_prio = prev->prio; - __entry->prev_state = prev->state; + __entry->prev_state = __trace_sched_switch_state(prev); memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); __entry->next_pid = next->pid; __entry->next_prio = next->prio; |