Skip to content

Commit

Permalink
syscalls/x86: auto-create compat_sys_*() prototypes
Browse files Browse the repository at this point in the history
compat_sys_*() functions are no longer called from within the kernel on
x86 except from the system call table. Linking the system call does not
require compat_sys_*() function prototypes at least on x86. Therefore,
generate compat_sys_*() prototypes on-the-fly within the
COMPAT_SYSCALL_DEFINEx() macro, and remove x86-specific prototypes from
various header files.

Suggested-by: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: x86@kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Dominik Brodowski committed Apr 2, 2018
1 parent c679a08 commit 3e2052e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 80 deletions.
1 change: 0 additions & 1 deletion arch/x86/ia32/ia32_signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <asm/vdso.h>
#include <asm/sigframe.h>
#include <asm/sighandling.h>
#include <asm/sys_ia32.h>
#include <asm/smap.h>

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/ia32/sys_ia32.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <linux/uaccess.h>
#include <linux/atomic.h>
#include <asm/vgtod.h>
#include <asm/sys_ia32.h>
#include <asm/ia32.h>

#define AA(__x) ((unsigned long)(__x))

Expand Down
64 changes: 0 additions & 64 deletions arch/x86/include/asm/sys_ia32.h

This file was deleted.

17 changes: 3 additions & 14 deletions include/linux/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)

#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
__attribute__((alias(__stringify(compat_SyS##name)))); \
static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
Expand Down Expand Up @@ -507,8 +508,8 @@ int __compat_save_altstack(compat_stack_t __user *, unsigned long);

/*
* These syscall function prototypes are kept in the same order as
* include/uapi/asm-generic/unistd.h. Architecture specific entries go below,
* followed by deprecated or obsolete system calls.
* include/uapi/asm-generic/unistd.h. Deprecated or obsolete system calls
* go below.
*
* Please note that these prototypes here are only provided for information
* purposes, for static analysis, and for linking from the syscall table.
Expand Down Expand Up @@ -882,18 +883,6 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long fd,
#endif


/*
* Architecture-specific system calls
*/

/* fs/quota/compat.c -- x86 only */
asmlinkage long compat_sys_quotactl32(unsigned int cmd,
const char __user *special, qid_t id, void __user *addr);

/* arch_prctl -- x86 */
asmlinkage long compat_sys_arch_prctl(int option, unsigned long arg2);


/*
* Deprecated system calls which are still defined in
* include/uapi/asm-generic/unistd.h and wanted by >= 1 arch
Expand Down

0 comments on commit 3e2052e

Please sign in to comment.