diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-26 07:24:19 +0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-04 00:09:22 +0400 |
commit | 574c4866e33d648520a8bd5bf6f573ea6e554e88 (patch) | |
tree | 354c1c42819cba60481a854281f1e130c7cec260 /arch/sparc | |
parent | 92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (diff) | |
download | linux-574c4866e33d648520a8bd5bf6f573ea6e554e88.tar.xz |
consolidate kernel-side struct sigaction declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/signal.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/uapi/asm/signal.h | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/systbls.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h index e1881856a55c..c33ce3f2ba84 100644 --- a/arch/sparc/include/asm/signal.h +++ b/arch/sparc/include/asm/signal.h @@ -22,6 +22,7 @@ #define SA_STATIC_ALLOC 0x8000 #define __ARCH_HAS_KA_RESTORER +#define __ARCH_HAS_SA_RESTORER #endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC_SIGNAL_H) */ diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index c4ffd6c97106..284836f0b7dc 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h @@ -153,12 +153,14 @@ struct sigstack { #include <asm-generic/signal-defs.h> +#ifndef __KERNEL__ struct __new_sigaction { __sighandler_t sa_handler; unsigned long sa_flags; __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */ __new_sigset_t sa_mask; }; +#endif struct __old_sigaction { __sighandler_t sa_handler; diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h index 118759cd7342..1dd89dbac8d8 100644 --- a/arch/sparc/kernel/systbls.h +++ b/arch/sparc/kernel/systbls.h @@ -3,8 +3,8 @@ #include <linux/kernel.h> #include <linux/types.h> +#include <linux/signal.h> #include <asm/utrap.h> -#include <asm/signal.h> extern asmlinkage unsigned long sys_getpagesize(void); extern asmlinkage long sparc_pipe(struct pt_regs *regs); |