OSDN Git Service

Regression: partial revert "tracing: Remove lock_depth from event entry"
authorArjan van de Ven <arjan@linux.intel.com>
Fri, 6 May 2011 03:55:18 +0000 (23:55 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 May 2011 20:20:59 +0000 (13:20 -0700)
commita3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd
tree8ed40e1c0bb654d824e39e6b42d1619a2807e75d
parente5e06985bec89414ce2b3f301c24d884f609b020
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>
include/linux/ftrace_event.h
kernel/trace/trace.c
kernel/trace/trace_events.c