From f5057819264fb14b82e259144790dffe84e994de Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Wed, 7 Oct 2009 18:28:14 -0400
Subject: [PATCH] --- yaml --- r: 169439 b: refs/heads/master c:
 e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81 h: refs/heads/master i:   169437:
 93cbff3126c5b82c7ce72e815d1bc34d9228f8a3   169435:
 fcb172e779ad00f92ff21e68794ca0a92124f328   169431:
 a6e3f32a0a6bb0ab485e1d3a1058aad37bf778cf   169423:
 a2042a53b78e628f80ebd4ec02290d4d9b8cb3b4   169407:
 c5da9ad27d72f2792644d0d260de0cc7ffb6411c v: v3

---
 [refs]                            | 2 +-
 trunk/kernel/trace/trace_kprobe.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2b993fc5e6aa..e97f91f41a2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a703d946e883d8e447d0597de556e2effd110372
+refs/heads/master: e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81
diff --git a/trunk/kernel/trace/trace_kprobe.c b/trunk/kernel/trace/trace_kprobe.c
index bb6cb2bc6fae..739f70e8e924 100644
--- a/trunk/kernel/trace/trace_kprobe.c
+++ b/trunk/kernel/trace/trace_kprobe.c
@@ -39,10 +39,10 @@
 #define KPROBE_EVENT_SYSTEM "kprobes"
 
 /* Reserved field names */
-#define FIELD_STRING_IP "ip"
-#define FIELD_STRING_NARGS "nargs"
-#define FIELD_STRING_RETIP "ret_ip"
-#define FIELD_STRING_FUNC "func"
+#define FIELD_STRING_IP "__probe_ip"
+#define FIELD_STRING_NARGS "__probe_nargs"
+#define FIELD_STRING_RETIP "__probe_ret_ip"
+#define FIELD_STRING_FUNC "__probe_func"
 
 const char *reserved_field_names[] = {
 	"common_type",