Commit e93f4d85 authored Oct 07, 2009 by Masami Hiramatsu Committed by Frederic Weisbecker Oct 12, 2009

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>

parent a703d946

kernel/trace/trace_kprobe.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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",