From 9002eecb97d21e46c2aa8190fa7a05bd2889c8ce Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 24 Feb 2009 12:07:53 -0500
Subject: [PATCH] --- yaml --- r: 140789 b: refs/heads/master c:
 7c37730cd31ddb2d3a1da142af9b18c29b8c433b h: refs/heads/master i:   140787:
 9eaf18e52dfdde535af40a47b4739b28d12b598c v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/tracepoint.h | 3 +++
 trunk/kernel/trace/trace.c       | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 818fd0a1ea49..5796134d1c88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 886b5b73d71e4027d7dc6c14f5f7ab102201ea6b
+refs/heads/master: 7c37730cd31ddb2d3a1da142af9b18c29b8c433b
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index 757005458366..34ae464effff 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -153,4 +153,7 @@ static inline void tracepoint_synchronize_unregister(void)
 	synchronize_sched();
 }
 
+#define DEFINE_TRACE_FMT(name, proto, args, fmt)		\
+	DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))
+
 #endif
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 11ba100f9a9e..e1f3b99a2e52 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2938,6 +2938,11 @@ static __init int tracer_init_debugfs(void)
 	if (!entry)
 		pr_warning("Could not create debugfs 'tracing_cpumask' entry\n");
 
+	entry = debugfs_create_file("latency_trace", 0444, d_tracer,
+				    &global_trace, &tracing_lt_fops);
+	if (!entry)
+		pr_warning("Could not create debugfs 'latency_trace' entry\n");
+
 	entry = debugfs_create_file("trace", 0444, d_tracer,
 				    &global_trace, &tracing_fops);
 	if (!entry)