X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Ftrace%2Fftrace.h;h=1ee19a24cc5f7170a3dab525767c669f3773dc7e;hb=87291347c49dc40aa339f587b209618201c2e527;hp=1a8b28db37752707cb130566b6295eb3f8bc4b90;hpb=03c7287dd22c18815964219c9a2e75054cd004df;p=~andy%2Flinux

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 1a8b28db377..1ee19a24cc5 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -310,15 +310,12 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = {	\
 #undef __array
 #define __array(type, item, len)					\
 	do {								\
-		mutex_lock(&event_storage_mutex);			\
+		char *type_str = #type"["__stringify(len)"]";		\
 		BUILD_BUG_ON(len > MAX_FILTER_STR_VAL);			\
-		snprintf(event_storage, sizeof(event_storage),		\
-			 "%s[%d]", #type, len);				\
-		ret = trace_define_field(event_call, event_storage, #item, \
+		ret = trace_define_field(event_call, type_str, #item,	\
 				 offsetof(typeof(field), item),		\
 				 sizeof(field.item),			\
 				 is_signed_type(type), FILTER_OTHER);	\
-		mutex_unlock(&event_storage_mutex);			\
 		if (ret)						\
 			return ret;					\
 	} while (0);