forked from Minki/linux
54d46ea993
Pull signal handling cleanups from Al Viro: "sigaltstack infrastructure + conversion for x86, alpha and um, COMPAT_SYSCALL_DEFINE infrastructure. Note that there are several conflicts between "unify SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline; resolution is trivial - just remove definitions of SS_ONSTACK and SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and include/uapi/linux/signal.h contains the unified variant." Fixed up conflicts as per Al. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: alpha: switch to generic sigaltstack new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those generic compat_sys_sigaltstack() introduce generic sys_sigaltstack(), switch x86 and um to it new helper: compat_user_stack_pointer() new helper: restore_altstack() unify SS_ONSTACK/SS_DISABLE definitions new helper: current_user_stack_pointer() missing user_stack_pointer() instances Bury the conditionals from kernel_thread/kernel_execve series COMPAT_SYSCALL_DEFINE: infrastructure
64 lines
1.6 KiB
C
64 lines
1.6 KiB
C
#ifndef _ASM_X86_UNISTD_H
|
|
#define _ASM_X86_UNISTD_H 1
|
|
|
|
#include <uapi/asm/unistd.h>
|
|
|
|
|
|
# ifdef CONFIG_X86_X32_ABI
|
|
# define __SYSCALL_MASK (~(__X32_SYSCALL_BIT))
|
|
# else
|
|
# define __SYSCALL_MASK (~0)
|
|
# endif
|
|
|
|
# ifdef CONFIG_X86_32
|
|
|
|
# include <asm/unistd_32.h>
|
|
# define __ARCH_WANT_STAT64
|
|
# define __ARCH_WANT_SYS_IPC
|
|
# define __ARCH_WANT_SYS_OLD_MMAP
|
|
# define __ARCH_WANT_SYS_OLD_SELECT
|
|
|
|
# else
|
|
|
|
# include <asm/unistd_64.h>
|
|
# include <asm/unistd_64_x32.h>
|
|
# define __ARCH_WANT_COMPAT_SYS_TIME
|
|
|
|
# endif
|
|
|
|
# define __ARCH_WANT_OLD_READDIR
|
|
# define __ARCH_WANT_OLD_STAT
|
|
# define __ARCH_WANT_SYS_ALARM
|
|
# define __ARCH_WANT_SYS_FADVISE64
|
|
# define __ARCH_WANT_SYS_GETHOSTNAME
|
|
# define __ARCH_WANT_SYS_GETPGRP
|
|
# define __ARCH_WANT_SYS_LLSEEK
|
|
# define __ARCH_WANT_SYS_NICE
|
|
# define __ARCH_WANT_SYS_OLDUMOUNT
|
|
# define __ARCH_WANT_SYS_OLD_GETRLIMIT
|
|
# define __ARCH_WANT_SYS_OLD_UNAME
|
|
# define __ARCH_WANT_SYS_PAUSE
|
|
# define __ARCH_WANT_SYS_RT_SIGACTION
|
|
# define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
|
# define __ARCH_WANT_SYS_SGETMASK
|
|
# define __ARCH_WANT_SYS_SIGNAL
|
|
# define __ARCH_WANT_SYS_SIGPENDING
|
|
# define __ARCH_WANT_SYS_SIGPROCMASK
|
|
# define __ARCH_WANT_SYS_SOCKETCALL
|
|
# define __ARCH_WANT_SYS_TIME
|
|
# define __ARCH_WANT_SYS_UTIME
|
|
# define __ARCH_WANT_SYS_WAITPID
|
|
# define __ARCH_WANT_SYS_FORK
|
|
# define __ARCH_WANT_SYS_VFORK
|
|
# define __ARCH_WANT_SYS_CLONE
|
|
|
|
/*
|
|
* "Conditional" syscalls
|
|
*
|
|
* What we want is __attribute__((weak,alias("sys_ni_syscall"))),
|
|
* but it doesn't work on all toolchains, so we just do it by hand
|
|
*/
|
|
# define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
|
|
|
|
#endif /* _ASM_X86_UNISTD_H */
|