diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-01-24 13:39:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 13:39:31 +0100 |
| commit | 4913ae3991acf00b414701852ee2193d1edd9c2d (patch) | |
| tree | b079652f0a897f86c5ecc16b2d4ba4bc3fefd220 /include/linux/ftrace_event.h | |
| parent | Merge tag 'usb-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | ring-buffer: Remove trace.h from ring_buffer.c (diff) | |
| download | linux-dev-4913ae3991acf00b414701852ee2193d1edd9c2d.tar.xz linux-dev-4913ae3991acf00b414701852ee2193d1edd9c2d.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
This commit:
tracing: Remove the extra 4 bytes of padding in events
changes the ABI. All involved parties seem to agree that it's safe to
do now, but the devil is in the details ...
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ftrace_event.h')
| -rw-r--r-- | include/linux/ftrace_event.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index a3d489531d83..6f8d0b77006b 100644 --- a/include/linux/ftrace_event.h +++ b/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 \ @@ -272,7 +271,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type, extern int trace_add_event_call(struct ftrace_event_call *call); extern void trace_remove_event_call(struct ftrace_event_call *call); -#define is_signed_type(type) (((type)(-1)) < 0) +#define is_signed_type(type) (((type)(-1)) < (type)0) int trace_set_clr_event(const char *system, const char *event, int set); |