diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 18:10:04 +0200 |
---|---|---|
committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 18:10:04 +0200 |
commit | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch) | |
tree | fbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /kernel/trace/trace.c | |
parent | Correct occurrences of (diff) | |
parent | Create Documentation/security/, (diff) | |
download | linux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.tar.xz linux-2f3e4af471e38e0658e701973238ae4b5e50fcd6.zip |
Merge branch 'docs-security' into docs-move
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 d38c16a06a6f..1cb49be7c7fb 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) | |