From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Dec 2012 02:05:28 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
X-Git-Tag: v3.8-rc1~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54d46ea993744c5408e39ce0cb4851e13cbea716;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/signal

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
---

54d46ea993744c5408e39ce0cb4851e13cbea716
diff --cc arch/alpha/include/uapi/asm/signal.h
index 965bbfa,0000000..dd4ca4bc
mode 100644,000000..100644
--- a/arch/alpha/include/uapi/asm/signal.h
+++ b/arch/alpha/include/uapi/asm/signal.h
@@@ -1,135 -1,0 +1,129 @@@
 +#ifndef _UAPI_ASMAXP_SIGNAL_H
 +#define _UAPI_ASMAXP_SIGNAL_H
 +
 +#include <linux/types.h>
 +
 +/* Avoid too many header ordering problems.  */
 +struct siginfo;
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +#define NSIG		32
 +typedef unsigned long sigset_t;
 +
 +#endif /* __KERNEL__ */
 +
 +
 +/*
 + * Linux/AXP has different signal numbers that Linux/i386: I'm trying
 + * to make it OSF/1 binary compatible, at least for normal binaries.
 + */
 +#define SIGHUP		 1
 +#define SIGINT		 2
 +#define SIGQUIT		 3
 +#define SIGILL		 4
 +#define SIGTRAP		 5
 +#define SIGABRT		 6
 +#define SIGEMT		 7
 +#define SIGFPE		 8
 +#define SIGKILL		 9
 +#define SIGBUS		10
 +#define SIGSEGV		11
 +#define SIGSYS		12
 +#define SIGPIPE		13
 +#define SIGALRM		14
 +#define SIGTERM		15
 +#define SIGURG		16
 +#define SIGSTOP		17
 +#define SIGTSTP		18
 +#define SIGCONT		19
 +#define SIGCHLD		20
 +#define SIGTTIN		21
 +#define SIGTTOU		22
 +#define SIGIO		23
 +#define SIGXCPU		24
 +#define SIGXFSZ		25
 +#define SIGVTALRM	26
 +#define SIGPROF		27
 +#define SIGWINCH	28
 +#define SIGINFO		29
 +#define SIGUSR1		30
 +#define SIGUSR2		31
 +
 +#define SIGPOLL	SIGIO
 +#define SIGPWR	SIGINFO
 +#define SIGIOT	SIGABRT
 +
 +/* These should not be considered constants from userland.  */
 +#define SIGRTMIN	32
 +#define SIGRTMAX	_NSIG
 +
 +/*
 + * SA_FLAGS values:
 + *
 + * SA_ONSTACK indicates that a registered stack_t will be used.
 + * SA_RESTART flag to get restarting signals (which were the default long ago)
 + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
 + * SA_RESETHAND clears the handler when the signal is delivered.
 + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
 + * SA_NODEFER prevents the current signal from being masked in the handler.
 + *
 + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
 + * Unix names RESETHAND and NODEFER respectively.
 + */
 +
 +#define SA_ONSTACK	0x00000001
 +#define SA_RESTART	0x00000002
 +#define SA_NOCLDSTOP	0x00000004
 +#define SA_NODEFER	0x00000008
 +#define SA_RESETHAND	0x00000010
 +#define SA_NOCLDWAIT	0x00000020
 +#define SA_SIGINFO	0x00000040
 +
 +#define SA_ONESHOT	SA_RESETHAND
 +#define SA_NOMASK	SA_NODEFER
 +
- /* 
-  * sigaltstack controls
-  */
- #define SS_ONSTACK	1
- #define SS_DISABLE	2
- 
 +#define MINSIGSTKSZ	4096
 +#define SIGSTKSZ	16384
 +
 +#define SIG_BLOCK          1	/* for blocking signals */
 +#define SIG_UNBLOCK        2	/* for unblocking signals */
 +#define SIG_SETMASK        3	/* for setting the signal mask */
 +
 +#include <asm-generic/signal-defs.h>
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +struct sigaction {
 +	union {
 +	  __sighandler_t	_sa_handler;
 +	  void (*_sa_sigaction)(int, struct siginfo *, void *);
 +	} _u;
 +	sigset_t	sa_mask;
 +	int		sa_flags;
 +};
 +
 +#define sa_handler	_u._sa_handler
 +#define sa_sigaction	_u._sa_sigaction
 +
 +#endif /* __KERNEL__ */
 +
 +typedef struct sigaltstack {
 +	void __user *ss_sp;
 +	int ss_flags;
 +	size_t ss_size;
 +} stack_t;
 +
 +/* sigstack(2) is deprecated, and will be withdrawn in a future version
 +   of the X/Open CAE Specification.  Use sigaltstack instead.  It is only
 +   implemented here for OSF/1 compatibility.  */
 +
 +struct sigstack {
 +	void __user *ss_sp;
 +	int ss_onstack;
 +};
 +
 +
 +#endif /* _UAPI_ASMAXP_SIGNAL_H */
diff --cc arch/cris/include/asm/ptrace.h
index 2de84d7,551c081..9e788d0
--- a/arch/cris/include/asm/ptrace.h
+++ b/arch/cris/include/asm/ptrace.h
@@@ -9,5 -10,8 +9,6 @@@
  #define PTRACE_SETREGS            13
  
  #define profile_pc(regs) instruction_pointer(regs)
+ #define current_user_stack_pointer() rdusp()
  
 -#endif /* __KERNEL__ */
 -
  #endif /* _CRIS_PTRACE_H */
diff --cc arch/cris/include/uapi/asm/signal.h
index 2162494,0000000..ce42fa7
mode 100644,000000..100644
--- a/arch/cris/include/uapi/asm/signal.h
+++ b/arch/cris/include/uapi/asm/signal.h
@@@ -1,122 -1,0 +1,116 @@@
 +#ifndef _UAPI_ASM_CRIS_SIGNAL_H
 +#define _UAPI_ASM_CRIS_SIGNAL_H
 +
 +#include <linux/types.h>
 +
 +/* Avoid too many header ordering problems.  */
 +struct siginfo;
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +#define NSIG		32
 +typedef unsigned long sigset_t;
 +
 +#endif /* __KERNEL__ */
 +
 +#define SIGHUP		 1
 +#define SIGINT		 2
 +#define SIGQUIT		 3
 +#define SIGILL		 4
 +#define SIGTRAP		 5
 +#define SIGABRT		 6
 +#define SIGIOT		 6
 +#define SIGBUS		 7
 +#define SIGFPE		 8
 +#define SIGKILL		 9
 +#define SIGUSR1		10
 +#define SIGSEGV		11
 +#define SIGUSR2		12
 +#define SIGPIPE		13
 +#define SIGALRM		14
 +#define SIGTERM		15
 +#define SIGSTKFLT	16
 +#define SIGCHLD		17
 +#define SIGCONT		18
 +#define SIGSTOP		19
 +#define SIGTSTP		20
 +#define SIGTTIN		21
 +#define SIGTTOU		22
 +#define SIGURG		23
 +#define SIGXCPU		24
 +#define SIGXFSZ		25
 +#define SIGVTALRM	26
 +#define SIGPROF		27
 +#define SIGWINCH	28
 +#define SIGIO		29
 +#define SIGPOLL		SIGIO
 +/*
 +#define SIGLOST		29
 +*/
 +#define SIGPWR		30
 +#define SIGSYS          31
 +#define	SIGUNUSED	31
 +
 +/* These should not be considered constants from userland.  */
 +#define SIGRTMIN        32
 +#define SIGRTMAX        _NSIG
 +
 +/*
 + * SA_FLAGS values:
 + *
 + * SA_ONSTACK indicates that a registered stack_t will be used.
 + * SA_RESTART flag to get restarting signals (which were the default long ago)
 + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
 + * SA_RESETHAND clears the handler when the signal is delivered.
 + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
 + * SA_NODEFER prevents the current signal from being masked in the handler.
 + *
 + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
 + * Unix names RESETHAND and NODEFER respectively.
 + */
 +
 +#define SA_NOCLDSTOP	0x00000001u
 +#define SA_NOCLDWAIT	0x00000002u
 +#define SA_SIGINFO	0x00000004u
 +#define SA_ONSTACK	0x08000000u
 +#define SA_RESTART	0x10000000u
 +#define SA_NODEFER	0x40000000u
 +#define SA_RESETHAND	0x80000000u
 +
 +#define SA_NOMASK	SA_NODEFER
 +#define SA_ONESHOT	SA_RESETHAND
 +
 +#define SA_RESTORER	0x04000000
 +
- /* 
-  * sigaltstack controls
-  */
- #define SS_ONSTACK	1
- #define SS_DISABLE	2
- 
 +#define MINSIGSTKSZ	2048
 +#define SIGSTKSZ	8192
 +
 +#include <asm-generic/signal-defs.h>
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +struct sigaction {
 +	union {
 +	  __sighandler_t _sa_handler;
 +	  void (*_sa_sigaction)(int, struct siginfo *, void *);
 +	} _u;
 +	sigset_t sa_mask;
 +	unsigned long sa_flags;
 +	void (*sa_restorer)(void);
 +};
 +
 +#define sa_handler	_u._sa_handler
 +#define sa_sigaction	_u._sa_sigaction
 +
 +#endif /* __KERNEL__ */
 +
 +typedef struct sigaltstack {
 +	void *ss_sp;
 +	int ss_flags;
 +	size_t ss_size;
 +} stack_t;
 +
 +
 +#endif /* _UAPI_ASM_CRIS_SIGNAL_H */
diff --cc arch/h8300/include/asm/ptrace.h
index 79c9a91,6183371..c1826b9
--- a/arch/h8300/include/asm/ptrace.h
+++ b/arch/h8300/include/asm/ptrace.h
@@@ -28,5 -63,7 +28,6 @@@
  #define current_pt_regs() ((struct pt_regs *) \
  	(THREAD_SIZE + (unsigned long)current_thread_info()) - 1)
  #define signal_pt_regs() ((struct pt_regs *)current->thread.esp0)
+ #define current_user_stack_pointer() rdusp()
 -#endif /* __KERNEL__ */
  #endif /* __ASSEMBLY__ */
  #endif /* _H8300_PTRACE_H */
diff --cc arch/h8300/include/uapi/asm/signal.h
index 913729e,0000000..af3a6c3
mode 100644,000000..100644
--- a/arch/h8300/include/uapi/asm/signal.h
+++ b/arch/h8300/include/uapi/asm/signal.h
@@@ -1,121 -1,0 +1,115 @@@
 +#ifndef _UAPI_H8300_SIGNAL_H
 +#define _UAPI_H8300_SIGNAL_H
 +
 +#include <linux/types.h>
 +
 +/* Avoid too many header ordering problems.  */
 +struct siginfo;
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +#define NSIG		32
 +typedef unsigned long sigset_t;
 +
 +#endif /* __KERNEL__ */
 +
 +#define SIGHUP		 1
 +#define SIGINT		 2
 +#define SIGQUIT		 3
 +#define SIGILL		 4
 +#define SIGTRAP		 5
 +#define SIGABRT		 6
 +#define SIGIOT		 6
 +#define SIGBUS		 7
 +#define SIGFPE		 8
 +#define SIGKILL		 9
 +#define SIGUSR1		10
 +#define SIGSEGV		11
 +#define SIGUSR2		12
 +#define SIGPIPE		13
 +#define SIGALRM		14
 +#define SIGTERM		15
 +#define SIGSTKFLT	16
 +#define SIGCHLD		17
 +#define SIGCONT		18
 +#define SIGSTOP		19
 +#define SIGTSTP		20
 +#define SIGTTIN		21
 +#define SIGTTOU		22
 +#define SIGURG		23
 +#define SIGXCPU		24
 +#define SIGXFSZ		25
 +#define SIGVTALRM	26
 +#define SIGPROF		27
 +#define SIGWINCH	28
 +#define SIGIO		29
 +#define SIGPOLL		SIGIO
 +/*
 +#define SIGLOST		29
 +*/
 +#define SIGPWR		30
 +#define SIGSYS		31
 +#define	SIGUNUSED	31
 +
 +/* These should not be considered constants from userland.  */
 +#define SIGRTMIN	32
 +#define SIGRTMAX	_NSIG
 +
 +/*
 + * SA_FLAGS values:
 + *
 + * SA_ONSTACK indicates that a registered stack_t will be used.
 + * SA_RESTART flag to get restarting signals (which were the default long ago)
 + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
 + * SA_RESETHAND clears the handler when the signal is delivered.
 + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
 + * SA_NODEFER prevents the current signal from being masked in the handler.
 + *
 + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
 + * Unix names RESETHAND and NODEFER respectively.
 + */
 +#define SA_NOCLDSTOP	0x00000001
 +#define SA_NOCLDWAIT	0x00000002 /* not supported yet */
 +#define SA_SIGINFO	0x00000004
 +#define SA_ONSTACK	0x08000000
 +#define SA_RESTART	0x10000000
 +#define SA_NODEFER	0x40000000
 +#define SA_RESETHAND	0x80000000
 +
 +#define SA_NOMASK	SA_NODEFER
 +#define SA_ONESHOT	SA_RESETHAND
 +
 +#define SA_RESTORER	0x04000000
 +
- /* 
-  * sigaltstack controls
-  */
- #define SS_ONSTACK	1
- #define SS_DISABLE	2
- 
 +#define MINSIGSTKSZ	2048
 +#define SIGSTKSZ	8192
 +
 +#include <asm-generic/signal-defs.h>
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +struct sigaction {
 +	union {
 +	  __sighandler_t _sa_handler;
 +	  void (*_sa_sigaction)(int, struct siginfo *, void *);
 +	} _u;
 +	sigset_t sa_mask;
 +	unsigned long sa_flags;
 +	void (*sa_restorer)(void);
 +};
 +
 +#define sa_handler	_u._sa_handler
 +#define sa_sigaction	_u._sa_sigaction
 +
 +#endif /* __KERNEL__ */
 +
 +typedef struct sigaltstack {
 +	void *ss_sp;
 +	int ss_flags;
 +	size_t ss_size;
 +} stack_t;
 +
 +
 +#endif /* _UAPI_H8300_SIGNAL_H */
diff --cc arch/m32r/include/uapi/asm/signal.h
index ef9788f,0000000..54acacb
mode 100644,000000..100644
--- a/arch/m32r/include/uapi/asm/signal.h
+++ b/arch/m32r/include/uapi/asm/signal.h
@@@ -1,123 -1,0 +1,117 @@@
 +#ifndef _UAPI_ASM_M32R_SIGNAL_H
 +#define _UAPI_ASM_M32R_SIGNAL_H
 +
 +#include <linux/types.h>
 +#include <linux/time.h>
 +#include <linux/compiler.h>
 +
 +/* Avoid too many header ordering problems.  */
 +struct siginfo;
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +#define NSIG		32
 +typedef unsigned long sigset_t;
 +
 +#endif /* __KERNEL__ */
 +
 +#define SIGHUP		 1
 +#define SIGINT		 2
 +#define SIGQUIT		 3
 +#define SIGILL		 4
 +#define SIGTRAP		 5
 +#define SIGABRT		 6
 +#define SIGIOT		 6
 +#define SIGBUS		 7
 +#define SIGFPE		 8
 +#define SIGKILL		 9
 +#define SIGUSR1		10
 +#define SIGSEGV		11
 +#define SIGUSR2		12
 +#define SIGPIPE		13
 +#define SIGALRM		14
 +#define SIGTERM		15
 +#define SIGSTKFLT	16
 +#define SIGCHLD		17
 +#define SIGCONT		18
 +#define SIGSTOP		19
 +#define SIGTSTP		20
 +#define SIGTTIN		21
 +#define SIGTTOU		22
 +#define SIGURG		23
 +#define SIGXCPU		24
 +#define SIGXFSZ		25
 +#define SIGVTALRM	26
 +#define SIGPROF		27
 +#define SIGWINCH	28
 +#define SIGIO		29
 +#define SIGPOLL		SIGIO
 +/*
 +#define SIGLOST		29
 +*/
 +#define SIGPWR		30
 +#define SIGSYS		31
 +#define	SIGUNUSED	31
 +
 +/* These should not be considered constants from userland.  */
 +#define SIGRTMIN	32
 +#define SIGRTMAX	_NSIG
 +
 +/*
 + * SA_FLAGS values:
 + *
 + * SA_ONSTACK indicates that a registered stack_t will be used.
 + * SA_RESTART flag to get restarting signals (which were the default long ago)
 + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
 + * SA_RESETHAND clears the handler when the signal is delivered.
 + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
 + * SA_NODEFER prevents the current signal from being masked in the handler.
 + *
 + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
 + * Unix names RESETHAND and NODEFER respectively.
 + */
 +#define SA_NOCLDSTOP	0x00000001u
 +#define SA_NOCLDWAIT	0x00000002u
 +#define SA_SIGINFO	0x00000004u
 +#define SA_ONSTACK	0x08000000u
 +#define SA_RESTART	0x10000000u
 +#define SA_NODEFER	0x40000000u
 +#define SA_RESETHAND	0x80000000u
 +
 +#define SA_NOMASK	SA_NODEFER
 +#define SA_ONESHOT	SA_RESETHAND
 +
 +#define SA_RESTORER	0x04000000
 +
- /*
-  * sigaltstack controls
-  */
- #define SS_ONSTACK	1
- #define SS_DISABLE	2
- 
 +#define MINSIGSTKSZ	2048
 +#define SIGSTKSZ	8192
 +
 +#include <asm-generic/signal-defs.h>
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +struct sigaction {
 +	union {
 +	  __sighandler_t _sa_handler;
 +	  void (*_sa_sigaction)(int, struct siginfo *, void *);
 +	} _u;
 +	sigset_t sa_mask;
 +	unsigned long sa_flags;
 +	void (*sa_restorer)(void);
 +};
 +
 +#define sa_handler	_u._sa_handler
 +#define sa_sigaction	_u._sa_sigaction
 +
 +#endif /* __KERNEL__ */
 +
 +typedef struct sigaltstack {
 +	void __user *ss_sp;
 +	int ss_flags;
 +	size_t ss_size;
 +} stack_t;
 +
 +
 +#endif /* _UAPI_ASM_M32R_SIGNAL_H */
diff --cc arch/powerpc/include/asm/unistd.h
index 29365e1,784872f..1d4864a
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@@ -54,9 -54,7 +54,8 @@@
  #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
  #define __ARCH_WANT_SYS_NEWFSTATAT
  #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 +#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
  #endif
- #define __ARCH_WANT_SYS_EXECVE
  #define __ARCH_WANT_SYS_FORK
  #define __ARCH_WANT_SYS_VFORK
  #define __ARCH_WANT_SYS_CLONE
diff --cc arch/sparc/include/asm/unistd.h
index 497386a,0ecea6e..87ce24c
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@@ -45,9 -45,7 +45,8 @@@
  #define __ARCH_WANT_COMPAT_SYS_TIME
  #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
  #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 +#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
  #endif
- #define __ARCH_WANT_SYS_EXECVE
  
  /*
   * "Conditional" syscalls
diff --cc arch/tile/include/asm/unistd.h
index fe841e7,940831f..6ac2103
--- a/arch/tile/include/asm/unistd.h
+++ b/arch/tile/include/asm/unistd.h
@@@ -14,9 -14,7 +14,8 @@@
  /* In compat mode, we use sys_llseek() for compat_sys_llseek(). */
  #ifdef CONFIG_COMPAT
  #define __ARCH_WANT_SYS_LLSEEK
 +#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
  #endif
  #define __ARCH_WANT_SYS_NEWFSTATAT
- #define __ARCH_WANT_SYS_EXECVE
  #define __ARCH_WANT_SYS_CLONE
  #include <uapi/asm/unistd.h>
diff --cc arch/x86/Kconfig
index 97f8c5a,f380614..79795af
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -108,10 -106,8 +108,8 @@@ config X8
  	select KTIME_SCALAR if X86_32
  	select GENERIC_STRNCPY_FROM_USER
  	select GENERIC_STRNLEN_USER
 -	select HAVE_RCU_USER_QS if X86_64
 +	select HAVE_CONTEXT_TRACKING if X86_64
  	select HAVE_IRQ_TIME_ACCOUNTING
- 	select GENERIC_KERNEL_THREAD
- 	select GENERIC_KERNEL_EXECVE
  	select MODULES_USE_ELF_REL if X86_32
  	select MODULES_USE_ELF_RELA if X86_64
  	select CLONE_BACKWARDS if X86_32
diff --cc arch/x86/include/uapi/asm/signal.h
index 0818f9a,0000000..aa7d6ae
mode 100644,000000..100644
--- a/arch/x86/include/uapi/asm/signal.h
+++ b/arch/x86/include/uapi/asm/signal.h
@@@ -1,145 -1,0 +1,139 @@@
 +#ifndef _UAPI_ASM_X86_SIGNAL_H
 +#define _UAPI_ASM_X86_SIGNAL_H
 +
 +#ifndef __ASSEMBLY__
 +#include <linux/types.h>
 +#include <linux/time.h>
 +#include <linux/compiler.h>
 +
 +/* Avoid too many header ordering problems.  */
 +struct siginfo;
 +
 +#ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +#define NSIG		32
 +typedef unsigned long sigset_t;
 +
 +#endif /* __KERNEL__ */
 +#endif /* __ASSEMBLY__ */
 +
 +
 +#define SIGHUP		 1
 +#define SIGINT		 2
 +#define SIGQUIT		 3
 +#define SIGILL		 4
 +#define SIGTRAP		 5
 +#define SIGABRT		 6
 +#define SIGIOT		 6
 +#define SIGBUS		 7
 +#define SIGFPE		 8
 +#define SIGKILL		 9
 +#define SIGUSR1		10
 +#define SIGSEGV		11
 +#define SIGUSR2		12
 +#define SIGPIPE		13
 +#define SIGALRM		14
 +#define SIGTERM		15
 +#define SIGSTKFLT	16
 +#define SIGCHLD		17
 +#define SIGCONT		18
 +#define SIGSTOP		19
 +#define SIGTSTP		20
 +#define SIGTTIN		21
 +#define SIGTTOU		22
 +#define SIGURG		23
 +#define SIGXCPU		24
 +#define SIGXFSZ		25
 +#define SIGVTALRM	26
 +#define SIGPROF		27
 +#define SIGWINCH	28
 +#define SIGIO		29
 +#define SIGPOLL		SIGIO
 +/*
 +#define SIGLOST		29
 +*/
 +#define SIGPWR		30
 +#define SIGSYS		31
 +#define	SIGUNUSED	31
 +
 +/* These should not be considered constants from userland.  */
 +#define SIGRTMIN	32
 +#define SIGRTMAX	_NSIG
 +
 +/*
 + * SA_FLAGS values:
 + *
 + * SA_ONSTACK indicates that a registered stack_t will be used.
 + * SA_RESTART flag to get restarting signals (which were the default long ago)
 + * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
 + * SA_RESETHAND clears the handler when the signal is delivered.
 + * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
 + * SA_NODEFER prevents the current signal from being masked in the handler.
 + *
 + * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
 + * Unix names RESETHAND and NODEFER respectively.
 + */
 +#define SA_NOCLDSTOP	0x00000001u
 +#define SA_NOCLDWAIT	0x00000002u
 +#define SA_SIGINFO	0x00000004u
 +#define SA_ONSTACK	0x08000000u
 +#define SA_RESTART	0x10000000u
 +#define SA_NODEFER	0x40000000u
 +#define SA_RESETHAND	0x80000000u
 +
 +#define SA_NOMASK	SA_NODEFER
 +#define SA_ONESHOT	SA_RESETHAND
 +
 +#define SA_RESTORER	0x04000000
 +
- /*
-  * sigaltstack controls
-  */
- #define SS_ONSTACK	1
- #define SS_DISABLE	2
- 
 +#define MINSIGSTKSZ	2048
 +#define SIGSTKSZ	8192
 +
 +#include <asm-generic/signal-defs.h>
 +
 +#ifndef __ASSEMBLY__
 +
 +
 +#ifdef __i386__
 +# ifndef __KERNEL__
 +/* Here we must cater to libcs that poke about in kernel headers.  */
 +
 +struct sigaction {
 +	union {
 +	  __sighandler_t _sa_handler;
 +	  void (*_sa_sigaction)(int, struct siginfo *, void *);
 +	} _u;
 +	sigset_t sa_mask;
 +	unsigned long sa_flags;
 +	void (*sa_restorer)(void);
 +};
 +
 +#define sa_handler	_u._sa_handler
 +#define sa_sigaction	_u._sa_sigaction
 +
 +# endif /* ! __KERNEL__ */
 +#else /* __i386__ */
 +
 +struct sigaction {
 +	__sighandler_t sa_handler;
 +	unsigned long sa_flags;
 +	__sigrestore_t sa_restorer;
 +	sigset_t sa_mask;		/* mask last for extensibility */
 +};
 +
 +struct k_sigaction {
 +	struct sigaction sa;
 +};
 +
 +#endif /* !__i386__ */
 +
 +typedef struct sigaltstack {
 +	void __user *ss_sp;
 +	int ss_flags;
 +	size_t ss_size;
 +} stack_t;
 +
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* _UAPI_ASM_X86_SIGNAL_H */
diff --cc arch/xtensa/Kconfig
index 73d34e7,03a8c10..5aab1ac
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -13,11 -13,8 +13,9 @@@ config XTENS
  	select GENERIC_CPU_DEVICES
  	select MODULES_USE_ELF_RELA
  	select GENERIC_PCI_IOMAP
- 	select GENERIC_KERNEL_THREAD
- 	select GENERIC_KERNEL_EXECVE
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select CLONE_BACKWARDS
 +	select IRQ_DOMAIN
  	help
  	  Xtensa processors are 32-bit RISC machines designed by Tensilica
  	  primarily for embedded systems.  These processors are both
diff --cc include/linux/compat.h
index e4920bd,3348133..dec7e2d1
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@@ -587,10 -642,14 +642,17 @@@ asmlinkage ssize_t compat_sys_process_v
  
  asmlinkage long compat_sys_sendfile(int out_fd, int in_fd,
  				    compat_off_t __user *offset, compat_size_t count);
+ #ifdef CONFIG_GENERIC_SIGALTSTACK
+ asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr,
+ 				       compat_stack_t __user *uoss_ptr);
+ 
+ int compat_restore_altstack(const compat_stack_t __user *uss);
+ int __compat_save_altstack(compat_stack_t __user *, unsigned long);
+ #endif
  
 +asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
 +						 struct compat_timespec __user *interval);
 +
  #else
  
  #define is_compat_task() (0)