2 files changed, 12 insertions, 11 deletions

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 46a27f2695a6..e61a7403f3d0 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -122,8 +122,9 @@ extern int filter_current_check_discard(struct ftrace_event_call *call,
                                         struct ring_buffer_event *event);
 
 extern int trace_define_field(struct ftrace_event_call *call, char *type,
-                              char *name, int offset, int size);
+                              char *name, int offset, int size, int is_signed);
 
+#define is_signed_type(type)    (((type)(-1)) < 0)
 
 /*
  * The double __builtin_constant_p is because gcc will give us an error
@@ -144,10 +145,10 @@ do {									\
                 __trace_printk(ip, fmt, ##args);                        \
 } while (0)
 
-#define __common_field(type, item)                                      \
+#define __common_field(type, item, is_signed)                           \
         ret = trace_define_field(event_call, #type, "common_" #item,    \
                                  offsetof(typeof(field.ent), item),     \
-                                 sizeof(field.ent.item));               \
+                                 sizeof(field.ent.item), is_signed);    \
         if (ret)                                                        \
                 return ret;
 
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 1e681142f1da..edb02bc9f8ff 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -225,7 +225,7 @@ ftrace_format_##call(struct trace_seq *s)				\
 #define __field(type, item)                                             \
         ret = trace_define_field(event_call, #type, #item,              \
                                  offsetof(typeof(field), item),         \
-                                 sizeof(field.item));                   \
+                                 sizeof(field.item), is_signed_type(type));     \
         if (ret)                                                        \
                 return ret;
 
@@ -234,7 +234,7 @@ ftrace_format_##call(struct trace_seq *s)				\
         BUILD_BUG_ON(len > MAX_FILTER_STR_VAL);                         \
         ret = trace_define_field(event_call, #type "[" #len "]", #item, \
                                  offsetof(typeof(field), item),         \
-                                 sizeof(field.item));                   \
+                                 sizeof(field.item), 0);                \
         if (ret)                                                        \
                 return ret;
 
@@ -242,7 +242,7 @@ ftrace_format_##call(struct trace_seq *s)				\
 #define __string(item, src)                                                    \
         ret = trace_define_field(event_call, "__str_loc", #item,               \
                                 offsetof(typeof(field), __str_loc_##item),     \
-                                sizeof(field.__str_loc_##item));
+                                 sizeof(field.__str_loc_##item), 0);
 
 #undef TRACE_EVENT
 #define TRACE_EVENT(call, proto, args, tstruct, func, print)            \
@@ -253,11 +253,11 @@ ftrace_define_fields_##call(void)					\
         struct ftrace_event_call *event_call = &event_##call;           \
         int ret;                                                        \
                                                                         \
-        __common_field(int, type);                                      \
-        __common_field(unsigned char, flags);                           \
-        __common_field(unsigned char, preempt_count);                   \
-        __common_field(int, pid);                                       \
-        __common_field(int, tgid);                                      \
+        __common_field(int, type, 1);                                   \
+        __common_field(unsigned char, flags, 0);                        \
+        __common_field(unsigned char, preempt_count, 0);                \
+        __common_field(int, pid, 1);                                    \
+        __common_field(int, tgid, 1);                                   \
                                                                         \
         tstruct;                                                        \
                                                                         \