aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 10:04:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 10:04:42 -0700
commit66cfb32772495068fbb5627b2dc88649ad66c3e5 (patch)
tree4ce3537afdbd9be92a7a3e6ef4e8e8519ee11543 /include
parent6742259866d03d5bc19815441ba928e8378343dc (diff)
parent7b8e6da46b921d30ac1553cac56d8fb74f0b431d (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')
-rw-r--r--include/trace/events/sched.h2
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,
TP_fast_assign(
__assign_str(filename, bprm->filename);
__entry->pid = p->pid;
- __entry->old_pid = p->pid;
+ __entry->old_pid = old_pid;
),
TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename),

Privacy Policy