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

Commit 3e65654e authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/syscalls: Move compat syscall entry handling into syscalltbl.sh 



Rather than duplicating the compat entry handling in all
consumers of syscalls_BITS.h, handle it directly in
syscalltbl.sh.  Now we generate entries in syscalls_32.h like:

__SYSCALL_I386(5, sys_open)
__SYSCALL_I386(5, compat_sys_open)

and all of its consumers implicitly get the right entry point.

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/b7c2b501dc0e6e43050e916b95807c3e2e16e9bb.1454022279.git.luto@kernel.org


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

arch/x86/entry/syscall_32.c

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

#include <asm/syscall.h>



#ifdef CONFIG_IA32_EMULATION

#define SYM(sym, compat) compat

#else

#define SYM(sym, compat) sym

#endif



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage long SYM(sym, compat)(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, compat) [nr] = SYM(sym, compat),

#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);

arch/x86/entry/syscall_64.c

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
#include <asm/asm-offsets.h>

#include <asm/syscall.h>



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

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

#include <asm/syscalls_64.h>

#undef __SYSCALL_64



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

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



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

arch/x86/entry/syscalls/syscalltbl.sh

+18 −4
Original line number Diff line number Diff line
@@ -8,10 +8,24 @@ emit() { 
    nr="$2"

    entry="$3"

    compat="$4"

    if [ -n "$compat" ]; then

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

    elif [ -n "$entry" ]; then

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



    if [ "$abi" == "64" -a -n "$compat" ]; then

	echo "a compat entry for a 64-bit syscall makes no sense" >&2

	exit 1

    fi



    if [ -z "$compat" ]; then

	if [ -n "$entry" ]; then

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

	fi

    else

	echo "#ifdef CONFIG_X86_32"

	if [ -n "$entry" ]; then

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

	fi

	echo "#else"

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

	echo "#endif"

    fi

}

arch/x86/kernel/asm-offsets_32.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/lguest.h>

#include "../../../drivers/lguest/lg.h"



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

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

static char syscalls[] = {

#include <asm/syscalls_32.h>

};

arch/x86/kernel/asm-offsets_64.c

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


#include <asm/ia32.h>



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

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

static char syscalls_64[] = {

#include <asm/syscalls_64.h>

};

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

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

static char syscalls_ia32[] = {

#include <asm/syscalls_32.h>

};