diff options
| author |  Masami Hiramatsu <mhiramat@redhat.com>
| 2009-10-07 18:28:14 -0400 |
|---|---|---|
| committer |  Frederic Weisbecker <fweisbec@gmail.com>
| 2009-10-12 23:31:51 +0200 |
| commit | e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81 (patch) | |
| tree | 8f4aa92c7e7875e654f40e1724b41064345001d8 | |
| parent | tracing/kprobes: Avoid field name confliction (diff) | |
| download | linux-e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81.tar.gz linux-e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81.tar.bz2 linux-e93f4d8539d5e9dd59f4af9d8ef4e9b62cfa1f81.zip | |
tracing/kprobes: Robustify fixed field names against variable field names conflicts
Rename probe-common fixed field names to harder conflictable names,
because current 'ip', 'func', and other probe field names are easily in
conflict with user-specified variable names.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Frank Ch. Eigler <fche@redhat.com>
LKML-Reference: <20091007222814.1684.407.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index bb6cb2bc6fae..739f70e8e924 100644 --- a/kernel/trace/trace_kprobe.c +++ b/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", |