diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 13:04:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 13:04:42 -0400 |
| commit | 66cfb32772495068fbb5627b2dc88649ad66c3e5 (patch) | |
| tree | 4ce3537afdbd9be92a7a3e6ef4e8e8519ee11543 /include/trace | |
| parent | 6742259866d03d5bc19815441ba928e8378343dc (diff) | |
| parent | 7b8e6da46b921d30ac1553cac56d8fb74f0b431d (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/p4: Add format attributes
tracing, sched, vfs: Fix 'old_pid' usage in trace_sched_process_exec()
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index fbc7b1ad929b..ea7a2035456d 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h | |||
| @@ -295,7 +295,7 @@ TRACE_EVENT(sched_process_exec, | |||
| 295 | TP_fast_assign( | 295 | TP_fast_assign( |
| 296 | __assign_str(filename, bprm->filename); | 296 | __assign_str(filename, bprm->filename); |
| 297 | __entry->pid = p->pid; | 297 | __entry->pid = p->pid; |
| 298 | __entry->old_pid = p->pid; | 298 | __entry->old_pid = old_pid; |
| 299 | ), | 299 | ), |
| 300 | 300 | ||
| 301 | TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename), | 301 | TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename), |