---

yaml --- r: 169439 b: refs/heads/master c: e93f4d8 h: refs/heads/master i: 169437: 93cbff3 169435: fcb172e 169431: a6e3f32 169423: a2042a5 169407: c5da9ad v: v3
git-mirror · Oct 12, 2009 · f505781 · f505781
1 parent 20e2b07
commit f505781
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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",