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

Commit 32324ce1 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/syscalls: Remove __SYSCALL_COMMON and __SYSCALL_X32 



The common/64/x32 distinction has no effect other than
determining which kernels actually support the syscall.  Move
the logic into syscalltbl.sh.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/58d4a95f40e43b894f93288b4a3633963d0ee22e.1454022279.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fba32474

arch/x86/entry/syscall_64.c

+0 −8
Original line number Diff line number Diff line
@@ -6,14 +6,6 @@ 
#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)



#ifdef CONFIG_X86_X32_ABI

# define __SYSCALL_X32(nr, sym, compat) __SYSCALL_64(nr, sym, compat)

#else

# define __SYSCALL_X32(nr, sym, compat) /* nothing */

#endif



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

#include <asm/syscalls_64.h>

#undef __SYSCALL_64

arch/x86/entry/syscalls/syscalltbl.sh

+16 −1
Original line number Diff line number Diff line
@@ -18,6 +18,21 @@ emit() { 
grep '^[0-9]' "$in" | sort -n | (

    while read nr abi name entry compat; do

	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`

	if [ "$abi" == "COMMON" -o "$abi" == "64" ]; then

	    # COMMON is the same as 64, except that we don't expect X32

	    # programs to use it.  Our expectation has nothing to do with

	    # any generated code, so treat them the same.

	    emit 64 "$nr" "$entry" "$compat"

	elif [ "$abi" == "X32" ]; then

	    # X32 is equivalent to 64 on an X32-compatible kernel.

	    echo "#ifdef CONFIG_X86_X32_ABI"

	    emit 64 "$nr" "$entry" "$compat"

	    echo "#endif"

	elif [ "$abi" == "I386" ]; then

	    emit "$abi" "$nr" "$entry" "$compat"

	else

	    echo "Unknown abi $abi" >&2

	    exit 1

	fi

    done

) > "$out"

arch/x86/kernel/asm-offsets_64.c

+0 −6
Original line number Diff line number Diff line
@@ -5,12 +5,6 @@ 
#include <asm/ia32.h>



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

#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,

#ifdef CONFIG_X86_X32_ABI

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

#else

# define __SYSCALL_X32(nr, sym, compat) /* nothing */

#endif

static char syscalls_64[] = {

#include <asm/syscalls_64.h>

};

arch/x86/um/sys_call_table_64.c

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ 
#define stub_execveat sys_execveat

#define stub_rt_sigreturn sys_rt_sigreturn



#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)

#define __SYSCALL_X32(nr, sym, compat) /* Not supported */



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

#include <asm/syscalls_64.h>

arch/x86/um/user-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ static char syscalls[] = { 
};

#else

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

#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,

#define __SYSCALL_X32(nr, sym, compat) /* Not supported */

static char syscalls[] = {

#include <asm/syscalls_64.h>

};