From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 6 May 2011 03:55:18 +0000 (-0400)
Subject: Regression: partial revert "tracing: Remove lock_depth from event entry"
X-Git-Tag: v2.6.39-rc7~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a4a5acd3bd2f6f1e102e1f1b9d2e2bb320a7fd;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed