mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 21:54:11 +08:00
perf trace: Check and discard not only 'nr' but also '__syscall_nr'
Format fields of a syscall have the first variable '__syscall_nr' or 'nr' that mean the syscall number. But it isn't relevant here so drop it. 'nr' among fields of syscall was renamed '__syscall_nr'. So add exception handling to drop '__syscall_nr' and modify the comment for this excpetion handling. Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1456492465-5946-1-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
67d5268908
commit
c42de706da
@ -1725,8 +1725,12 @@ static int trace__read_syscall_info(struct trace *trace, int id)
|
||||
|
||||
sc->args = sc->tp_format->format.fields;
|
||||
sc->nr_args = sc->tp_format->format.nr_fields;
|
||||
/* drop nr field - not relevant here; does not exist on older kernels */
|
||||
if (sc->args && strcmp(sc->args->name, "nr") == 0) {
|
||||
/*
|
||||
* We need to check and discard the first variable '__syscall_nr'
|
||||
* or 'nr' that mean the syscall number. It is needless here.
|
||||
* So drop '__syscall_nr' or 'nr' field but does not exist on older kernels.
|
||||
*/
|
||||
if (sc->args && (!strcmp(sc->args->name, "__syscall_nr") || !strcmp(sc->args->name, "nr"))) {
|
||||
sc->args = sc->args->next;
|
||||
--sc->nr_args;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user