diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
|---|---|---|
| committer | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-20 12:10:04 -0400 |
| commit | 2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch) | |
| tree | fbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /kernel/trace/trace.c | |
| parent | 61516587513c84ac26e68e3ab008dc6e965d0378 (diff) | |
| parent | d410fa4ef99112386de5f218dd7df7b4fca910b4 (diff) | |
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, | |||
| 1110 | 1110 | ||
| 1111 | entry->preempt_count = pc & 0xff; | 1111 | entry->preempt_count = pc & 0xff; |
| 1112 | entry->pid = (tsk) ? tsk->pid : 0; | 1112 | entry->pid = (tsk) ? tsk->pid : 0; |
| 1113 | entry->padding = 0; | ||
| 1113 | entry->flags = | 1114 | entry->flags = |
| 1114 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT | 1115 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT |
| 1115 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | | 1116 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | |