Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 375f81a568dc..6ea90c0e2c96 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1201,10 +1201,11 @@ static int __probe_event_show_format(struct trace_seq *s,
 #undef SHOW_FIELD
 #define SHOW_FIELD(type, item, name)                                    \
         do {                                                            \
-                ret = trace_seq_printf(s, "\tfield: " #type " %s;\t"    \
-                                "offset:%u;\tsize:%u;\n", name,         \
+                ret = trace_seq_printf(s, "\tfield:" #type " %s;\t"     \
+                                "offset:%u;\tsize:%u;\tsigned:%d;\n", name,\
                                 (unsigned int)offsetof(typeof(field), item),\
-                                (unsigned int)sizeof(type));            \
+                                (unsigned int)sizeof(type),             \
+                                is_signed_type(type));                  \
                 if (!ret)                                               \
                         return 0;                                       \
         } while (0)