From 81627718ba8cdf5ae8d321948b170546d2486a50 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 18 Jan 2013 10:31:20 -0500 Subject: [PATCH] --- yaml --- r: 349854 b: refs/heads/master c: b000c8065a92b0fe0e1694f41b2c8d8ba7b7b1ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/ftrace_event.h | 1 - trunk/kernel/trace/trace.c | 1 - trunk/kernel/trace/trace_events.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3355359e6719..a50b00ec73af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f684199f5de805ac50ea5bdec2b082882586a777 +refs/heads/master: b000c8065a92b0fe0e1694f41b2c8d8ba7b7b1ec diff --git a/trunk/include/linux/ftrace_event.h b/trunk/include/linux/ftrace_event.h index 43ef8b6cce7f..6f8d0b77006b 100644 --- a/trunk/include/linux/ftrace_event.h +++ b/trunk/include/linux/ftrace_event.h @@ -49,7 +49,6 @@ struct trace_entry { unsigned char flags; unsigned char preempt_count; int pid; - int padding; }; #define FTRACE_MAX_EVENT \ diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index d62248dfda76..a387bd271e71 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -1173,7 +1173,6 @@ 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/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 880073d0b946..57e9b284250c 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -116,7 +116,6 @@ 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; }