diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2011-05-05 23:55:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-06 13:20:59 -0700 |
| commit | a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd (patch) | |
| tree | 8ed40e1c0bb654d824e39e6b42d1619a2807e75d /kernel/trace | |
| parent | e5e06985bec89414ce2b3f301c24d884f609b020 (diff) | |
| download | kernel_samsung_smdk4412-a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd.zip kernel_samsung_smdk4412-a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd.tar.gz kernel_samsung_smdk4412-a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd.tar.bz2 | |
Regression: partial revert "tracing: Remove lock_depth from event entry"
This partially reverts commit e6e1e2593592a8f6f6380496655d8c6f67431266.
That commit changed the structure layout of the trace structure, which
in turn broke PowerTOP (1.9x generation) quite badly.
I appreciate not wanting to expose the variable in question, and
PowerTOP was not using it, so I've replaced the variable with just a
padding field - that way if in the future a new field is needed it can
just use this padding field.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_events.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index d38c16a..1cb49be 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) | diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index e88f74f..2fe1103 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -116,6 +116,7 @@ static int trace_define_common_fields(void) __common_field(unsigned char, flags); __common_field(unsigned char, preempt_count); __common_field(int, pid); + __common_field(int, padding); return ret; } |