Commit b5592e5c authored by Brian Gerst's avatar Brian Gerst Committed by Thomas Gleixner
Browse files

x86/entry: Remove syscall qualifier support 



Syscall qualifier support is no longer needed.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Link: https://lkml.kernel.org/r/20200313195144.164260-11-brgerst@gmail.com
parent d3b1b776

arch/x86/entry/syscall_32.c

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


#ifdef CONFIG_IA32_EMULATION

/* On X86_64, we use struct pt_regs * to pass parameters to syscalls */

#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);

#define __SYSCALL_I386(nr, sym) extern asmlinkage long sym(const struct pt_regs *);

#define __sys_ni_syscall __ia32_sys_ni_syscall

#else /* CONFIG_IA32_EMULATION */

#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

#define __SYSCALL_I386(nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

#define __sys_ni_syscall sys_ni_syscall

#endif /* CONFIG_IA32_EMULATION */
@@ -20,7 +20,7 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon 
#include <asm/syscalls_32.h>

#undef __SYSCALL_I386



#define __SYSCALL_I386(nr, sym, qual) [nr] = sym,

#define __SYSCALL_I386(nr, sym) [nr] = sym,



__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {

	/*

arch/x86/entry/syscall_64.c

+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
#include <asm/unistd.h>

#include <asm/syscall.h>



#define __SYSCALL_X32(nr, sym, qual)

#define __SYSCALL_X32(nr, sym)



#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);

#define __SYSCALL_64(nr, sym) extern asmlinkage long sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#undef __SYSCALL_64



#define __SYSCALL_64(nr, sym, qual) [nr] = sym,

#define __SYSCALL_64(nr, sym) [nr] = sym,



asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {

	/*

arch/x86/entry/syscall_x32.c

+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
#include <asm/unistd.h>

#include <asm/syscall.h>



#define __SYSCALL_64(nr, sym, qual)

#define __SYSCALL_64(nr, sym)



#define __SYSCALL_X32(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);

#define __SYSCALL_X32(nr, sym) extern asmlinkage long sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#undef __SYSCALL_X32



#define __SYSCALL_X32(nr, sym, qual) [nr] = sym,

#define __SYSCALL_X32(nr, sym) [nr] = sym,



asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {

	/*

arch/x86/entry/syscalls/syscalltbl.sh

+1 −9
Original line number Diff line number Diff line
@@ -9,15 +9,7 @@ syscall_macro() { 
    local nr="$2"

    local entry="$3"



    # Entry can be either just a function name or "function/qualifier"

    real_entry="${entry%%/*}"

    if [ "$entry" = "$real_entry" ]; then

        qualifier=

    else

        qualifier=${entry#*/}

    fi



    echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"

    echo "__SYSCALL_${abi}($nr, $entry)"

}



emit() {

arch/x86/um/sys_call_table_32.c

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 


#define old_mmap sys_old_mmap



#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#define __SYSCALL_I386(nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#include <asm/syscalls_32.h>



#undef __SYSCALL_I386

#define __SYSCALL_I386(nr, sym, qual) [ nr ] = sym,

#define __SYSCALL_I386(nr, sym) [ nr ] = sym,



extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

CRA Git | Maintained and supported by SUSTech CRA and CCSE