aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace_event.h4
-rw-r--r--include/trace/ftrace.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 75f3ac01a87c..2a4a40749911 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -16,7 +16,7 @@ struct dentry;
16 * bash-15816 [01] 235.197585: idle_cpu <- irq_enter 16 * bash-15816 [01] 235.197585: idle_cpu <- irq_enter
17 */ 17 */
18struct trace_entry { 18struct trace_entry {
19 unsigned char type; 19 int type;
20 unsigned char flags; 20 unsigned char flags;
21 unsigned char preempt_count; 21 unsigned char preempt_count;
22 int pid; 22 int pid;
@@ -73,7 +73,7 @@ enum print_line_t {
73 73
74 74
75struct ring_buffer_event * 75struct ring_buffer_event *
76trace_current_buffer_lock_reserve(unsigned char type, unsigned long len, 76trace_current_buffer_lock_reserve(int type, unsigned long len,
77 unsigned long flags, int pc); 77 unsigned long flags, int pc);
78void trace_current_buffer_unlock_commit(struct ring_buffer_event *event, 78void trace_current_buffer_unlock_commit(struct ring_buffer_event *event,
79 unsigned long flags, int pc); 79 unsigned long flags, int pc);
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 39a3351f2e7f..15ef08d9add1 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -198,7 +198,7 @@ ftrace_define_fields_##call(void) \
198 struct ftrace_event_call *event_call = &event_##call; \ 198 struct ftrace_event_call *event_call = &event_##call; \
199 int ret; \ 199 int ret; \
200 \ 200 \
201 __common_field(unsigned char, type); \ 201 __common_field(int, type); \
202 __common_field(unsigned char, flags); \ 202 __common_field(unsigned char, flags); \
203 __common_field(unsigned char, preempt_count); \ 203 __common_field(unsigned char, preempt_count); \
204 __common_field(int, pid); \ 204 __common_field(int, pid); \