From f07367954c9b41bf87deba08e79e5bb4c3b72c55 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 9 Jun 2011 01:43:22 +0200 Subject: [PATCH] Don't display bogus parameter for sigreturn syscall * linux/*/syscallent.h: For those arches which use sys_sigreturn, not printargs, to show [rt_]sigreturn syscall, change number of arguments from 1 to 0: sys_sigreturn function doesn't use syscall parameters. (I guess kernel doesn't actually _have_ any parameters for this syscall, at least on these architectures). Do the same change for I386 and x86-64 even though they use printargs: I looked at kernel code and syscall definitely doesn't have any parameters on these arches. (I hesitate to change 1 to 0 params for arches I don't know - it is remotely possible some of them do have a parameter for this syscall). Signed-off-by: Denys Vlasenko --- linux/alpha/syscallent.h | 2 +- linux/arm/syscallent.h | 2 +- linux/bfin/syscallent.h | 2 +- linux/hppa/syscallent.h | 2 +- linux/i386/syscallent.h | 4 ++-- linux/m68k/syscallent.h | 2 +- linux/microblaze/syscallent.h | 2 +- linux/mips/syscallent.h | 2 +- linux/powerpc/syscallent.h | 2 +- linux/s390/syscallent.h | 4 ++-- linux/s390x/syscallent.h | 4 ++-- linux/sh/syscallent.h | 2 +- linux/sh64/syscallent.h | 2 +- linux/sparc/syscallent.h | 2 +- linux/x86_64/syscallent.h | 6 +++--- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index 07344bc3..7fe45a3f 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -131,7 +131,7 @@ { 2, 0, sys_getpriority, "osf_getpriority" }, /* 100 */ { 4, TN, sys_send, "send" }, /* 101 */ { 4, TN, sys_recv, "recv" }, /* 102 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 103 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 103 */ { 3, TN, sys_bind, "bind" }, /* 104 */ { 5, TN, sys_setsockopt, "setsockopt" }, /* 105 */ { 2, TN, sys_listen, "listen" }, /* 106 */ diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index e0ea8119..9203b236 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc" }, /* 117 */ { 1, 0, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 7cfd79db..86f0101d 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index 8dbbbeb8..24cfb237 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -178,7 +178,7 @@ { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ { 3, 0, sys_setresgid, "getresgid" }, /* 171 */ { 5, 0, sys_prctl, "prctl" }, /* 172 */ - { 1, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ + { 0, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask" }, /* 175 */ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 16ef36b8..7779d380 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ @@ -201,7 +201,7 @@ { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ { 3, 0, sys_getresgid, "getresgid" }, /* 171 */ { 5, 0, sys_prctl, "prctl" }, /* 172 */ - { 1, TS, printargs, "rt_sigreturn" }, /* 173 */ + { 0, TS, printargs, "rt_sigreturn" }, /* 173 */ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index febb341c..c64575fd 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc" }, /* 117 */ { 1, 0, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index 3e1790cc..4a941ec0 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -145,7 +145,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc" }, /* 117 */ { 1, 0, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/mips/syscallent.h b/linux/mips/syscallent.h index 5756fae1..3382ffdd 100644 --- a/linux/mips/syscallent.h +++ b/linux/mips/syscallent.h @@ -4121,7 +4121,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 4116 */ { 6, 0, sys_ipc, "ipc" }, /* 4117 */ { 1, TD, sys_fsync, "fsync" }, /* 4118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 4119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 4119 */ { 5, TP, sys_clone, "clone" }, /* 4120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 4121 */ { 1, 0, sys_uname, "uname" }, /* 4122 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 2ec92474..e2b950eb 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 6, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index a4ff1522..38d0e03e 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 5, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ @@ -201,7 +201,7 @@ { 3, 0, sys_setresgid, "setresgid" }, /* 170 */ { 3, 0, sys_getresgid, "getresgid" }, /* 171 */ { 5, 0, sys_prctl, "prctl" }, /* 172 */ - { 1, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ + { 0, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 1ea682a0..8b03db8a 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -146,7 +146,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 5, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ @@ -200,7 +200,7 @@ { -1, 0, printargs, "SYS_170" }, /* 170 */ { -1, 0, printargs, "SYS_171" }, /* 171 */ { 5, 0, sys_prctl, "prctl" }, /* 172 */ - { 1, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ + { 0, TS, sys_sigreturn, "rt_sigreturn" }, /* 173 */ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 6ffbe0c5..d73e951d 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -149,7 +149,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 5, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 3103207d..75617cd2 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -147,7 +147,7 @@ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ { 5, 0, sys_ipc, "ipc" }, /* 117 */ { 1, TD, sys_fsync, "fsync" }, /* 118 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 119 */ { 5, TP, sys_clone, "clone" }, /* 120 */ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */ { 1, 0, sys_uname, "uname" }, /* 122 */ diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 65817486..62e0bccb 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -214,7 +214,7 @@ { 1, TF, sys_swapoff, "swapoff" }, /* 213 */ { 1, 0, sys_sysinfo, "sysinfo" }, /* 214 */ { 5, 0, sys_ipc, "ipc" }, /* 215 */ - { 1, TS, sys_sigreturn, "sigreturn" }, /* 216 */ + { 0, TS, sys_sigreturn, "sigreturn" }, /* 216 */ { 5, TP, sys_clone, "clone" }, /* 217 */ { 3, 0, sys_modify_ldt, "modify_ldt" }, /* 218 */ { 1, 0, sys_adjtimex, "adjtimex" }, /* 219 */ diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index 065b8ffe..73e4acf7 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -7,13 +7,13 @@ { 2, TF, sys_lstat, "lstat" }, /* 6 */ { 3, TD, sys_poll, "poll" }, /* 7 */ { 3, TD, sys_lseek, "lseek" }, /* 8 */ - { 6, TD, sys_mmap, "mmap" }, /* 9 */ + { 6, TD, sys_mmap, "mmap" }, /* 9 */ { 3, 0, sys_mprotect, "mprotect" }, /* 10 */ { 2, 0, sys_munmap, "munmap" }, /* 11 */ { 1, 0, sys_brk, "brk" }, /* 12 */ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 13 */ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 14 */ - { 1, TS, printargs, "rt_sigreturn" }, /* 15 */ + { 0, TS, printargs, "rt_sigreturn" }, /* 15 */ { 3, TD, sys_ioctl, "ioctl" }, /* 16 */ { 5, TD, sys_pread, "pread" }, /* 17 */ { 5, TD, sys_pwrite, "pwrite" }, /* 18 */ @@ -22,7 +22,7 @@ { 2, TF, sys_access, "access" }, /* 21 */ { 1, TD, sys_pipe, "pipe" }, /* 22 */ { 5, TD, sys_select, "select" }, /* 23 */ - { 0, 0, sys_sched_yield, "sched_yield"}, /* 24 */ + { 0, 0, sys_sched_yield, "sched_yield" }, /* 24 */ { 5, 0, sys_mremap, "mremap" }, /* 25 */ { 3, 0, sys_msync, "msync" }, /* 26 */ { 3, 0, sys_mincore, "mincore" }, /* 27 */ -- 2.40.0