diff options
| author | Ingo Molnar | 2011-05-10 17:05:24 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-05-10 17:05:45 +0200 |
| commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
| tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /kernel/trace/trace.c | |
| parent | Merge branch 'perf/stat' into perf/core (diff) | |
| parent | Linux 2.6.39-rc7 (diff) | |
| download | kernel-qcow2-linux-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.tar.gz kernel-qcow2-linux-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.tar.xz kernel-qcow2-linux-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.zip | |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e0e14ce0caab..ee9c921d7f21 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1110,6 +1110,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, entry->preempt_count = pc & 0xff; entry->pid = (tsk) ? tsk->pid : 0; + entry->padding = 0; entry->flags = #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | |