Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e937a9a authored by Eric Paris's avatar Eric Paris
Browse files

syscall_get_arch: remove useless function arguments 



Every caller of syscall_get_arch() uses current for the task and no
implementors of the function need args.  So just get rid of both of
those things.  Admittedly, since these are inline functions we aren't
wasting stack space, but it just makes the prototypes better.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux390@de.ibm.com
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-arch@vger.kernel.org
parent b7550787

arch/arm/include/asm/syscall.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -103,8 +103,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));

	memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));

}

}





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

	/* ARM tasks don't change audit architectures on the fly. */

	/* ARM tasks don't change audit architectures on the fly. */

	return AUDIT_ARCH_ARM;

	return AUDIT_ARCH_ARM;

arch/mips/include/asm/syscall.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ extern const unsigned long sys_call_table[]; 
extern const unsigned long sys32_call_table[];

extern const unsigned long sys32_call_table[];

extern const unsigned long sysn32_call_table[];

extern const unsigned long sysn32_call_table[];





static inline int __syscall_get_arch(void)

static inline int syscall_get_arch(void)

{

{

	int arch = EM_MIPS;

	int arch = EM_MIPS;

#ifdef CONFIG_64BIT

#ifdef CONFIG_64BIT

arch/mips/kernel/ptrace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -671,7 +671,7 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs) 
	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_enter(regs, regs->regs[2]);

		trace_sys_enter(regs, regs->regs[2]);





	audit_syscall_entry(__syscall_get_arch(),

	audit_syscall_entry(syscall_get_arch(),

			    regs->regs[2],

			    regs->regs[2],

			    regs->regs[4], regs->regs[5],

			    regs->regs[4], regs->regs[5],

			    regs->regs[6], regs->regs[7]);

			    regs->regs[6], regs->regs[7]);

arch/s390/include/asm/syscall.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -89,11 +89,10 @@ static inline void syscall_set_arguments(struct task_struct *task, 
		regs->orig_gpr2 = args[0];

		regs->orig_gpr2 = args[0];

}

}





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	if (test_tsk_thread_flag(task, TIF_31BIT))

	if (test_tsk_thread_flag(current, TIF_31BIT))

		return AUDIT_ARCH_S390;

		return AUDIT_ARCH_S390;

#endif

#endif

	return sizeof(long) == 8 ? AUDIT_ARCH_S390X : AUDIT_ARCH_S390;

	return sizeof(long) == 8 ? AUDIT_ARCH_S390X : AUDIT_ARCH_S390;

arch/x86/include/asm/syscall.h

+3 −5
Original line number Original line Diff line number Diff line
@@ -91,8 +91,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	memcpy(&regs->bx + i, args, n * sizeof(args[0]));

	memcpy(&regs->bx + i, args, n * sizeof(args[0]));

}

}





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

	return AUDIT_ARCH_I386;

	return AUDIT_ARCH_I386;

}

}
@@ -221,8 +220,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
		}

		}

}

}





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

#ifdef CONFIG_IA32_EMULATION

#ifdef CONFIG_IA32_EMULATION

	/*

	/*
@@ -234,7 +232,7 @@ static inline int syscall_get_arch(struct task_struct *task, 
	 *

	 *

	 * x32 tasks should be considered AUDIT_ARCH_X86_64.

	 * x32 tasks should be considered AUDIT_ARCH_X86_64.

	 */

	 */

	if (task_thread_info(task)->status & TS_COMPAT)

	if (task_thread_info(current)->status & TS_COMPAT)

		return AUDIT_ARCH_I386;

		return AUDIT_ARCH_I386;

#endif

#endif

	/* Both x32 and x86_64 are considered "64-bit". */

	/* Both x32 and x86_64 are considered "64-bit". */