arch: remove unused function syscall_set_arguments()
Subsystems (16)
PATCH 1/1 arch: remove unused function syscall_set_arguments()
This function appears to have been unused since it was first introduced in commit 828c365cc8b8 ("tracehook: asm/syscall.h").
Signed-off-by Peter Collingbourne <[email protected]>
--- arch/arm/include/asm/syscall.h | 10 -------- arch/arm64/include/asm/syscall.h | 10 -------- arch/csky/include/asm/syscall.h | 9 -------- arch/ia64/include/asm/syscall.h | 17 ++------------ arch/ia64/kernel/ptrace.c | 31 ++++++++++--------------- arch/microblaze/include/asm/syscall.h | 33 --------------------------- arch/nds32/include/asm/syscall.h | 22 ------------------ arch/nios2/include/asm/syscall.h | 11 --------- arch/openrisc/include/asm/syscall.h | 7 ------ arch/powerpc/include/asm/syscall.h | 10 -------- arch/riscv/include/asm/syscall.h | 9 -------- arch/s390/include/asm/syscall.h | 12 ---------- arch/sh/include/asm/syscall_32.h | 12 ---------- arch/sparc/include/asm/syscall.h | 10 -------- arch/um/include/asm/syscall-generic.h | 14 ------------ arch/x86/include/asm/syscall.h | 33 --------------------------- arch/xtensa/include/asm/syscall.h | 11 --------- include/asm-generic/syscall.h | 16 ------------- 18 files changed, 14 insertions(+), 263 deletions(-)
arch/arm/include/asm/syscall.h +0 -10
@@ -77,16 +77,6 @@ static inline void syscall_get_arguments(struct task_struct *task,memcpy (args, ®s->ARM_r0 +1 ,5 *sizeof (args[0 ])); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ - regs->ARM_ORIG_r0 = args[0 ]; - args++; - -memcpy (®s->ARM_r0 +1 , args,5 *sizeof (args[0 ])); -} -static inline int syscall_get_arch (struct task_struct *task) {/* ARM tasks don't change audit architectures on the fly. */
arch/arm64/include/asm/syscall.h +0 -10
@@ -73,16 +73,6 @@ static inline void syscall_get_arguments(struct task_struct *task,memcpy (args, ®s->regs[1 ],5 *sizeof (args[0 ])); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ - regs->orig_x0 = args[0 ]; - args++; - -memcpy (®s->regs[1 ], args,5 *sizeof (args[0 ])); -} -/* * We don't care about endianness (__AUDIT_ARCH_LE bit) here because * AArch64 has the same system calls both on little- and big- endian.
arch/csky/include/asm/syscall.h +0 -9
@@ -59,15 +59,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,memcpy (args, ®s->a1,5 *sizeof (args[0 ])); } -static inline void -syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -const unsigned long *args) -{ - regs->orig_a0 = args[0 ]; - args++; -memcpy (®s->a1, args,5 *sizeof (regs->a1)); -} -static inline int syscall_get_arch (struct task_struct *task) {
arch/ia64/include/asm/syscall.h +2 -15
@@ -55,21 +55,8 @@ static inline void syscall_set_return_value(struct task_struct *task, } } -extern void ia64_syscall_get_set_arguments (struct task_struct *task, -struct pt_regs *regs,unsigned long *args,int rw); -static inline void syscall_get_arguments (struct task_struct *task, -struct pt_regs *regs, -unsigned long *args) -{ -ia64_syscall_get_set_arguments (task, regs, args,0 ); -} - -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -unsigned long *args) -{ -ia64_syscall_get_set_arguments (task, regs, args,1 ); -} +extern void syscall_get_arguments (struct task_struct *task, +struct pt_regs *regs,unsigned long *args);static inline int syscall_get_arch (struct task_struct *task) {
arch/ia64/kernel/ptrace.c +12 -19
@@ -2001,17 +2001,16 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *tsk)return &user_ia64_view; } -struct syscall_get_set_args { +struct syscall_get_args {unsigned int i;unsigned int n;unsigned long *args;struct pt_regs *regs; -int rw; }; -static void syscall_get_set_args_cb (struct unw_frame_info *info,void *data) +static void syscall_get_args_cb (struct unw_frame_info *info,void *data) { -struct syscall_get_set_args *args = data; +struct syscall_get_args *args = data;struct pt_regs *pt = args->regs;unsigned long *krbs, cfm, ndirty, nlocals, nouts;int i, count;
@@ -2042,37 +2041,31 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)/* Iterate over outs. */ for (i =0 ; i < count; i++) {int j = ndirty + nlocals + i + args->i; -if (args->rw) - *ia64_rse_skip_regs (krbs, j) = args->args[i]; -else - args->args[i] = *ia64_rse_skip_regs (krbs, j); + args->args[i] = *ia64_rse_skip_regs (krbs, j); } -if (!args->rw) { -while (i < args->n) { - args->args[i] =0 ; - i++; - } +while (i < args->n) { + args->args[i] =0 ; + i++; } } -void ia64_syscall_get_set_arguments (struct task_struct *task, -struct pt_regs *regs,unsigned long *args,int rw) +void syscall_get_arguments (struct task_struct *task, +struct pt_regs *regs,unsigned long *args) { -struct syscall_get_set_args data = { +struct syscall_get_args data = { .i =0 , .n =6 , .args = args, .regs = regs, - .rw = rw, };if (task = current) -unw_init_running (syscall_get_set_args_cb, &data); +unw_init_running (syscall_get_args_cb, &data);else {struct unw_frame_info ufi;memset (&ufi,0 ,sizeof (ufi));unw_init_from_blocked_task (&ufi, task); -syscall_get_set_args_cb (&ufi, &data); +syscall_get_args_cb (&ufi, &data); } }
arch/microblaze/include/asm/syscall.h +0 -33
@@ -58,28 +58,6 @@ static inline microblaze_reg_t microblaze_get_syscall_arg(struct pt_regs *regs,return ~0 ; } -static inline void microblaze_set_syscall_arg (struct pt_regs *regs, -unsigned int n, -unsigned long val) -{ -switch (n) { -case 5 : - regs->r10 = val; -case 4 : - regs->r9 = val; -case 3 : - regs->r8 = val; -case 2 : - regs->r7 = val; -case 1 : - regs->r6 = val; -case 0 : - regs->r5 = val; -default : -BUG (); - } -} -static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs,unsigned long *args)
@@ -91,17 +69,6 @@ static inline void syscall_get_arguments(struct task_struct *task, *args++ =microblaze_get_syscall_arg (regs, i++); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -unsigned int i =0 ; -unsigned int n =6 ; - -while (n--) -microblaze_set_syscall_arg (regs, i++, *args++); -} -asmlinkage unsigned long do_syscall_trace_enter (struct pt_regs *regs); asmlinkage void do_syscall_trace_leave(struct pt_regs *regs);
arch/nds32/include/asm/syscall.h +0 -22
@@ -132,28 +132,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,memcpy (args, ®s->uregs[0 ] +1 ,5 *sizeof (args[0 ])); } -/** -* syscall_set_arguments - change system call parameter value -* @task: task of interest, must be in system call entry tracing -* @regs: task_pt_regs() of @task -* @args: array of argument values to store -* -* Changes 6 arguments to the system call. The first argument gets value -* @args[0], and so on. -* -* It's only valid to call this when @task is stopped for tracing on -* entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -*/ -static inline void -syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -const unsigned long *args) -{ - regs->orig_r0 = args[0 ]; - args++; - -memcpy (®s->uregs[0 ] +1 , args,5 *sizeof (args[0 ])); -} -static inline int syscall_get_arch (struct task_struct *task) {
arch/nios2/include/asm/syscall.h +0 -11
@@ -58,17 +58,6 @@ static inline void syscall_get_arguments(struct task_struct *task, *args = regs->r9; } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs,const unsigned long *args) -{ - regs->r4 = *args++; - regs->r5 = *args++; - regs->r6 = *args++; - regs->r7 = *args++; - regs->r8 = *args++; - regs->r9 = *args; -} -static inline int syscall_get_arch (struct task_struct *task) {return AUDIT_ARCH_NIOS2 ;
arch/openrisc/include/asm/syscall.h +0 -7
@@ -57,13 +57,6 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,memcpy (args, ®s->gpr[3 ],6 *sizeof (args[0 ])); } -static inline void -syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -const unsigned long *args) -{ -memcpy (®s->gpr[3 ], args,6 *sizeof (args[0 ])); -} -static inline int syscall_get_arch (struct task_struct *task) {return AUDIT_ARCH_OPENRISC ;
arch/powerpc/include/asm/syscall.h +0 -10
@@ -103,16 +103,6 @@ static inline void syscall_get_arguments(struct task_struct *task, } } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -memcpy (®s->gpr[3 ], args,6 *sizeof (args[0 ])); - -/* Also copy the first argument into orig_gpr3 */ - regs->orig_gpr3 = args[0 ]; -} -static inline int syscall_get_arch (struct task_struct *task) {if (is_32bit_task ())
arch/riscv/include/asm/syscall.h +0 -9
@@ -64,15 +64,6 @@ static inline void syscall_get_arguments(struct task_struct *task,memcpy (args, ®s->a1,5 *sizeof (args[0 ])); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ - regs->orig_a0 = args[0 ]; - args++; -memcpy (®s->a1, args,5 *sizeof (regs->a1)); -} -static inline int syscall_get_arch (struct task_struct *task) {#ifdef CONFIG_64BIT
arch/s390/include/asm/syscall.h +0 -12
@@ -78,18 +78,6 @@ static inline void syscall_get_arguments(struct task_struct *task, args[0 ] = regs->orig_gpr2 & mask; } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -unsigned int n =6 ; - -while (n-- >0 ) -if (n >0 ) - regs->gprs[2 + n] = args[n]; - regs->orig_gpr2 = args[0 ]; -} -static inline int syscall_get_arch (struct task_struct *task) {#ifdef CONFIG_COMPAT
arch/sh/include/asm/syscall_32.h +0 -12
@@ -57,18 +57,6 @@ static inline void syscall_get_arguments(struct task_struct *task, args[0 ] = regs->regs[4 ]; } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ - regs->regs[1 ] = args[5 ]; - regs->regs[0 ] = args[4 ]; - regs->regs[7 ] = args[3 ]; - regs->regs[6 ] = args[2 ]; - regs->regs[5 ] = args[1 ]; - regs->regs[4 ] = args[0 ]; -} -static inline int syscall_get_arch (struct task_struct *task) {int arch =AUDIT_ARCH_SH ;
arch/sparc/include/asm/syscall.h +0 -10
@@ -117,16 +117,6 @@ static inline void syscall_get_arguments(struct task_struct *task, } } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -unsigned int i; - -for (i =0 ; i <6 ; i++) - regs->u_regs[UREG_I0 + i] = args[i]; -} -static inline int syscall_get_arch (struct task_struct *task) {#if defined(CONFIG_SPARC64 ) && defined(CONFIG_COMPAT )
arch/um/include/asm/syscall-generic.h +0 -14
@@ -62,20 +62,6 @@ static inline void syscall_get_arguments(struct task_struct *task, *args = UPT_SYSCALL_ARG6(r); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -struct uml_pt_regs *r = ®s->regs; - -UPT_SYSCALL_ARG1 (r) = *args++; -UPT_SYSCALL_ARG2 (r) = *args++; -UPT_SYSCALL_ARG3 (r) = *args++; -UPT_SYSCALL_ARG4 (r) = *args++; -UPT_SYSCALL_ARG5 (r) = *args++; -UPT_SYSCALL_ARG6 (r) = *args; -} -/* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */ #endif /* __UM_SYSCALL_GENERIC_H */
arch/x86/include/asm/syscall.h +0 -33
@@ -87,15 +87,6 @@ static inline void syscall_get_arguments(struct task_struct *task,memcpy (args, ®s->bx,6 *sizeof (args[0 ])); } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -unsigned int i,unsigned int n, -const unsigned long *args) -{ -BUG_ON (i + n >6 ); -memcpy (®s->bx + i, args, n *sizeof (args[0 ])); -} -static inline int syscall_get_arch (struct task_struct *task) {return AUDIT_ARCH_I386 ;
@@ -127,30 +118,6 @@ static inline void syscall_get_arguments(struct task_struct *task, } } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -# ifdef CONFIG_IA32_EMULATION -if (task->thread_info.status &TS_COMPAT ) { - regs->bx = *args++; - regs->cx = *args++; - regs->dx = *args++; - regs->si = *args++; - regs->di = *args++; - regs->bp = *args; - } else -# endif - { - regs->di = *args++; - regs->si = *args++; - regs->dx = *args++; - regs->r10 = *args++; - regs->r8 = *args++; - regs->r9 = *args; - } -} -static inline int syscall_get_arch (struct task_struct *task) {/* x32 tasks should be considered AUDIT_ARCH_X86_64. */
arch/xtensa/include/asm/syscall.h +0 -11
@@ -68,17 +68,6 @@ static inline void syscall_get_arguments(struct task_struct *task, args[i] = regs->areg[reg[i]]; } -static inline void syscall_set_arguments (struct task_struct *task, -struct pt_regs *regs, -const unsigned long *args) -{ -static const unsigned int reg[] =XTENSA_SYSCALL_ARGUMENT_REGS ; -unsigned int i; - -for (i =0 ; i <6 ; ++i) - regs->areg[reg[i]] = args[i]; -} -asmlinkage long xtensa_rt_sigreturn (void );asmlinkage long xtensa_shmat (int ,char __user *,int ); asmlinkage long xtensa_fadvise64_64(int, int,
include/asm-generic/syscall.h +0 -16
@@ -117,22 +117,6 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs,unsigned long *args); -/** -* syscall_set_arguments - change system call parameter value -* @task: task of interest, must be in system call entry tracing -* @regs: task_pt_regs() of @task -* @args: array of argument values to store -* -* Changes 6 arguments to the system call. -* The first argument gets value @args[0], and so on. -* -* It's only valid to call this when @task is stopped for tracing on -* entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or -* %SYSCALL_WORK_SYSCALL_AUDIT. -*/ -void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -const unsigned long *args); -/** * syscall_get_arch - return the AUDIT_ARCH for the current system call * @task: task of interest, must be blocked
Signature · 1 line
2.33.0.309.g3052b89438-goog
Arnd Bergmann
maintainerQuoted 6 lines · Peter Collingbourne
This function appears to have been unused since it was first introduced in commit
828c365cc8b8("tracehook:asm/syscall.h").
Looks good to me, applied to the asm-generic tree.
Arnd