Commit 3e5e7f77 authored by H. Peter Anvin (Intel)'s avatar H. Peter Anvin (Intel) Committed by Ingo Molnar
Browse files

x86/entry: Reverse arguments to do_syscall_64() 



Reverse the order of arguments to do_syscall_64() so that the first
argument is the pt_regs pointer. This is not only consistent with
*all* other entry points from assembly, but it actually makes the
compiled code slightly better.

Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210510185316.3307264-3-hpa@zytor.com
parent 6627eb25

arch/x86/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <asm/irq_stack.h>



#ifdef CONFIG_X86_64

__visible noinstr void do_syscall_64(unsigned long nr, struct pt_regs *regs)

__visible noinstr void do_syscall_64(struct pt_regs *regs, unsigned long nr)

{

	add_random_kstack_offset();

	nr = syscall_enter_from_user_mode(regs, nr);

arch/x86/entry/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ SYM_INNER_LABEL(entry_SYSCALL_64_after_hwframe, SYM_L_GLOBAL) 
	PUSH_AND_CLEAR_REGS rax=$-ENOSYS



	/* IRQs are off. */

	movq	%rax, %rdi

	movq	%rsp, %rsi

	movq	%rsp, %rdi

	movq	%rax, %rsi

	call	do_syscall_64		/* returns with IRQs disabled */



	/*

arch/x86/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static inline int syscall_get_arch(struct task_struct *task) 
		? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;

}



void do_syscall_64(unsigned long nr, struct pt_regs *regs);

void do_syscall_64(struct pt_regs *regs, unsigned long nr);

void do_int80_syscall_32(struct pt_regs *regs);

long do_fast_syscall_32(struct pt_regs *regs);