From aae4241e15050fb2371612bb55f763b22409eafe Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Fri, 14 Nov 2008 17:47:45 -0500
Subject: [PATCH] --- yaml --- r: 121143 b: refs/heads/master c:
 5f382671def7cb9c0f4b75d586dc5f60dca5e1c3 h: refs/heads/master i:   121141:
 49817b2609be1cb556a02379c7917eb43c2a1fae   121139:
 f5d6e6ff17716a649facb16cc0a90a68edbfc920   121135:
 45a1491b36ebbfea7c701e808b751001ab263885 v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/tracepoint.h | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e6e1e6001a35..d28453cab942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c420970ef476d7d68df119711700666224001f43
+refs/heads/master: 5f382671def7cb9c0f4b75d586dc5f60dca5e1c3
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index c60a791f8874..7e9b42aeae0e 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -60,7 +60,7 @@ struct tracepoint {
 	{								\
 		static const char __tpstrtab_##name[]			\
 		__attribute__((section("__tracepoints_strings")))	\
-		= #name ":" #proto;					\
+		= #name;						\
 		static struct tracepoint __tracepoint_##name		\
 		__attribute__((section("__tracepoints"), aligned(8))) =	\
 		{ __tpstrtab_##name, 0, NULL };				\
@@ -70,13 +70,11 @@ struct tracepoint {
 	}								\
 	static inline int register_trace_##name(void (*probe)(proto))	\
 	{								\
-		return tracepoint_probe_register(#name ":" #proto,	\
-			(void *)probe);					\
+		return tracepoint_probe_register(#name, (void *)probe);	\
 	}								\
 	static inline int unregister_trace_##name(void (*probe)(proto))	\
 	{								\
-		return tracepoint_probe_unregister(#name ":" #proto,	\
-			(void *)probe);					\
+		return tracepoint_probe_unregister(#name, (void *)probe);\
 	}
 
 extern void tracepoint_update_probe_range(struct tracepoint *begin,