diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 17:55:31 -0400 |
| commit | e2b8b2808538a91444e78c7db5a30519cadd09b2 (patch) | |
| tree | 60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace.c | |
| parent | 4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (diff) | |
| parent | ef18012b248b47ec9a12c3a83ca5e99782d39c5d (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e5b56199e5e0..a941d257b619 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -799,7 +799,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, | |||
| 799 | 799 | ||
| 800 | entry->preempt_count = pc & 0xff; | 800 | entry->preempt_count = pc & 0xff; |
| 801 | entry->pid = (tsk) ? tsk->pid : 0; | 801 | entry->pid = (tsk) ? tsk->pid : 0; |
| 802 | entry->tgid = (tsk) ? tsk->tgid : 0; | 802 | entry->tgid = (tsk) ? tsk->tgid : 0; |
| 803 | entry->flags = | 803 | entry->flags = |
| 804 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT | 804 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT |
| 805 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | | 805 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | |