diff --git a/[refs] b/[refs]
index fb06627bd524..326cb99f9eb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f5359685af6de7dca101393dc606620adbe963f
+refs/heads/master: b0aae68cc5508f3c2fbf728988c954db4c8b8a53
diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h
index edb02bc9f8ff..b5ff2e8229ec 100644
--- a/trunk/include/trace/ftrace.h
+++ b/trunk/include/trace/ftrace.h
@@ -25,7 +25,7 @@
 #define __field(type, item)		type	item;
 
 #undef __string
-#define __string(item, src)		int	__str_loc_##item;
+#define __string(item, src)		unsigned short	__str_loc_##item;
 
 #undef TP_STRUCT__entry
 #define TP_STRUCT__entry(args...) args