aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ftrace_event.h
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2011-05-05 23:55:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-06 13:20:59 -0700
commita3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd (patch)
tree8ed40e1c0bb654d824e39e6b42d1619a2807e75d /include/linux/ftrace_event.h
parente5e06985bec89414ce2b3f301c24d884f609b020 (diff)
downloadkernel_samsung_espresso10-a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd.zip
kernel_samsung_espresso10-a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd.tar.gz
kernel_samsung_espresso10-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 'include/linux/ftrace_event.h')
-rw-r--r--include/linux/ftrace_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 22b32af..b5a550a 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -37,6 +37,7 @@ struct trace_entry {
unsigned char flags;
unsigned char preempt_count;
int pid;
+ int padding;
};
#define FTRACE_MAX_EVENT \