Reset to 3.12.19

3 files changed, 2 insertions, 106 deletions

diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
deleted file mode 100644
index 6122e42..0000000
--- a/include/trace/events/hist.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM hist
-
-#if !defined(_TRACE_HIST_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HIST_H
-
-#include "latency_hist.h"
-#include <linux/tracepoint.h>
-
-#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
-#define trace_preemptirqsoff_hist(a, b)
-#else
-TRACE_EVENT(preemptirqsoff_hist,
-
-	TP_PROTO(int reason, int starthist),
-
-	TP_ARGS(reason, starthist),
-
-	TP_STRUCT__entry(
-		__field(int,	reason)
-		__field(int,	starthist)
-	),
-
-	TP_fast_assign(
-		__entry->reason		= reason;
-		__entry->starthist	= starthist;
-	),
-
-	TP_printk("reason=%s starthist=%s", getaction(__entry->reason),
-		  __entry->starthist ? "start" : "stop")
-);
-#endif
-
-#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
-#define trace_hrtimer_interrupt(a, b, c, d)
-#else
-TRACE_EVENT(hrtimer_interrupt,
-
-	TP_PROTO(int cpu, long long offset, struct task_struct *curr,
-		struct task_struct *task),
-
-	TP_ARGS(cpu, offset, curr, task),
-
-	TP_STRUCT__entry(
-		__field(int,		cpu)
-		__field(long long,	offset)
-		__array(char,		ccomm,	TASK_COMM_LEN)
-		__field(int,		cprio)
-		__array(char,		tcomm,	TASK_COMM_LEN)
-		__field(int,		tprio)
-	),
-
-	TP_fast_assign(
-		__entry->cpu	= cpu;
-		__entry->offset	= offset;
-		memcpy(__entry->ccomm, curr->comm, TASK_COMM_LEN);
-		__entry->cprio  = curr->prio;
-		memcpy(__entry->tcomm, task != NULL ? task->comm : "<none>",
-			task != NULL ? TASK_COMM_LEN : 7);
-		__entry->tprio  = task != NULL ? task->prio : -1;
-	),
-
-	TP_printk("cpu=%d offset=%lld curr=%s[%d] thread=%s[%d]",
-		__entry->cpu, __entry->offset, __entry->ccomm,
-		__entry->cprio, __entry->tcomm, __entry->tprio)
-);
-#endif
-
-#endif /* _TRACE_HIST_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
diff --git a/include/trace/events/latency_hist.h b/include/trace/events/latency_hist.h
deleted file mode 100644
index d3f2fbd..0000000
--- a/include/trace/events/latency_hist.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _LATENCY_HIST_H
-#define _LATENCY_HIST_H
-
-enum hist_action {
-	IRQS_ON,
-	PREEMPT_ON,
-	TRACE_STOP,
-	IRQS_OFF,
-	PREEMPT_OFF,
-	TRACE_START,
-};
-
-static char *actions[] = {
-	"IRQS_ON",
-	"PREEMPT_ON",
-	"TRACE_STOP",
-	"IRQS_OFF",
-	"PREEMPT_OFF",
-	"TRACE_START",
-};
-
-static inline char *getaction(int action)
-{
-	if (action >= 0 && action <= sizeof(actions)/sizeof(actions[0]))
-		return actions[action];
-	return "unknown";
-}
-
-#endif /* _LATENCY_HIST_H */
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 712ea36..645d749 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -303,15 +303,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);