diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 03:29:50 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 03:29:50 -0400 |
| commit | bd6356bdafc853201168f718f0059fbe11191461 (patch) | |
| tree | e2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /include/linux/ftrace_event.h | |
| parent | 3185847957d4834d1b30b253b1c71bb05bad7265 (diff) | |
| parent | 4b42120df72aeebd3967c952804cb1af53b91cc5 (diff) | |
Merge branch 'dev/removing-s5p6442' into for-next
Diffstat (limited to 'include/linux/ftrace_event.h')
| -rw-r--r-- | include/linux/ftrace_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 22b32af1b5e..b5a550a39a7 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h | |||
| @@ -37,6 +37,7 @@ struct trace_entry { | |||
| 37 | unsigned char flags; | 37 | unsigned char flags; |
| 38 | unsigned char preempt_count; | 38 | unsigned char preempt_count; |
| 39 | int pid; | 39 | int pid; |
| 40 | int padding; | ||
| 40 | }; | 41 | }; |
| 41 | 42 | ||
| 42 | #define FTRACE_MAX_EVENT \ | 43 | #define FTRACE_MAX_EVENT \ |