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>

authored by Arjan van de Ven and committed by Linus Torvalds a3a4a5ac e5e06985

+3
+1
include/linux/ftrace_event.h
··· 37 37 unsigned char flags; 38 38 unsigned char preempt_count; 39 39 int pid; 40 + int padding; 40 41 }; 41 42 42 43 #define FTRACE_MAX_EVENT \
+1
kernel/trace/trace.c
··· 1110 1110 1111 1111 entry->preempt_count = pc & 0xff; 1112 1112 entry->pid = (tsk) ? tsk->pid : 0; 1113 + entry->padding = 0; 1113 1114 entry->flags = 1114 1115 #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT 1115 1116 (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) |
+1
kernel/trace/trace_events.c
··· 116 116 __common_field(unsigned char, flags); 117 117 __common_field(unsigned char, preempt_count); 118 118 __common_field(int, pid); 119 + __common_field(int, padding); 119 120 120 121 return ret; 121 122 }