tracing/syscalls: Rename "/format" tracepoint field name "nr" to "__syscall_nr:
authorTaeung Song <treeze.taeung@gmail.com>
Fri, 26 Feb 2016 18:23:01 +0000 (13:23 -0500)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 29 Feb 2016 14:34:53 +0000 (11:34 -0300)
commit026842d148b920dc28f0499ede4950dcb098d4d5
tree965121dc56e2a6f72b1e2d4696f623e38412b95a
parentc42de706dad3f39c1f65e473a1d165ea33f8b6e8
tracing/syscalls: Rename "/format" tracepoint field name "nr" to "__syscall_nr:

Some tracepoint have multiple fields with the same name, "nr", the first
one is a unique syscall ID, the other is a syscall argument:

  # cat /sys/kernel/debug/tracing/events/syscalls/sys_enter_io_getevents/format
  name: sys_enter_io_getevents
  ID: 747
  format:
  field:unsigned short common_type; offset:0; size:2; signed:0;
  field:unsigned char common_flags; offset:2; size:1; signed:0;
  field:unsigned char common_preempt_count; offset:3; size:1; signed:0;
  field:int common_pid; offset:4; size:4; signed:1;

  field:int nr; offset:8; size:4; signed:1;
  field:aio_context_t ctx_id; offset:16; size:8; signed:0;
  field:long min_nr; offset:24; size:8; signed:0;
  field:long nr; offset:32; size:8; signed:0;
  field:struct io_event * events; offset:40; size:8; signed:0;
  field:struct timespec * timeout; offset:48; size:8; signed:0;

  print fmt: "ctx_id: 0x%08lx, min_nr: 0x%08lx, nr: 0x%08lx, events: 0x%08lx, timeout: 0x%08lx", ((unsigned long)(REC->ctx_id)), ((unsigned long)(REC->min_nr)), ((unsigned long)(REC->nr)), ((unsigned long)(REC->events)), ((unsigned long)(REC->timeout))
  #

Fix it by renaming the "/format" common tracepoint field "nr" to "__syscall_nr".

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
[ Do not rename the struct member, just the '/format' field name ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160226132301.3ae065a4@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
kernel/trace/trace_syscalls.c