aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-25 22:24:19 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 15:09:22 -0500
commit574c4866e33d648520a8bd5bf6f573ea6e554e88 (patch)
tree354c1c42819cba60481a854281f1e130c7cec260
parent92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (diff)
consolidate kernel-side struct sigaction declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/alpha/include/asm/signal.h6
-rw-r--r--arch/arm/include/asm/signal.h7
-rw-r--r--arch/avr32/include/asm/signal.h7
-rw-r--r--arch/cris/include/asm/signal.h7
-rw-r--r--arch/h8300/include/asm/signal.h7
-rw-r--r--arch/ia64/include/asm/signal.h6
-rw-r--r--arch/ia64/include/asm/unistd.h1
-rw-r--r--arch/m32r/include/asm/signal.h8
-rw-r--r--arch/m68k/include/asm/signal.h7
-rw-r--r--arch/mips/include/asm/signal.h2
-rw-r--r--arch/mips/include/uapi/asm/signal.h2
-rw-r--r--arch/mn10300/include/asm/signal.h7
-rw-r--r--arch/parisc/include/asm/signal.h2
-rw-r--r--arch/powerpc/include/asm/signal.h1
-rw-r--r--arch/powerpc/include/asm/syscalls.h1
-rw-r--r--arch/powerpc/include/uapi/asm/signal.h2
-rw-r--r--arch/s390/include/asm/signal.h8
-rw-r--r--arch/sparc/include/asm/signal.h1
-rw-r--r--arch/sparc/include/uapi/asm/signal.h2
-rw-r--r--arch/sparc/kernel/systbls.h2
-rw-r--r--arch/x86/include/asm/signal.h10
-rw-r--r--arch/x86/include/uapi/asm/signal.h4
-rw-r--r--arch/xtensa/include/asm/signal.h7
-rw-r--r--include/linux/signal.h14
-rw-r--r--include/linux/syscalls.h2
-rw-r--r--include/uapi/asm-generic/signal.h6
26 files changed, 48 insertions, 81 deletions
diff --git a/arch/alpha/include/asm/signal.h b/arch/alpha/include/asm/signal.h
index 8c06bd1dfffc..963f0494dca7 100644
--- a/arch/alpha/include/asm/signal.h
+++ b/arch/alpha/include/asm/signal.h
@@ -22,12 +22,6 @@ struct osf_sigaction {
22 int sa_flags; 22 int sa_flags;
23}; 23};
24 24
25struct sigaction {
26 __sighandler_t sa_handler;
27 unsigned long sa_flags;
28 sigset_t sa_mask; /* mask last for extensibility */
29};
30
31#define __ARCH_HAS_KA_RESTORER 25#define __ARCH_HAS_KA_RESTORER
32#include <asm/sigcontext.h> 26#include <asm/sigcontext.h>
33#endif 27#endif
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index 58057023ff60..a5076b9bd463 100644
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -23,12 +23,7 @@ struct old_sigaction {
23 __sigrestore_t sa_restorer; 23 __sigrestore_t sa_restorer;
24}; 24};
25 25
26struct sigaction { 26#define __ARCH_HAS_SA_RESTORER
27 __sighandler_t sa_handler;
28 unsigned long sa_flags;
29 __sigrestore_t sa_restorer;
30 sigset_t sa_mask; /* mask last for extensibility */
31};
32 27
33#include <asm/sigcontext.h> 28#include <asm/sigcontext.h>
34#endif 29#endif
diff --git a/arch/avr32/include/asm/signal.h b/arch/avr32/include/asm/signal.h
index c8858f0cef3d..d875eb6a3f3c 100644
--- a/arch/avr32/include/asm/signal.h
+++ b/arch/avr32/include/asm/signal.h
@@ -23,12 +23,7 @@ typedef struct {
23 unsigned long sig[_NSIG_WORDS]; 23 unsigned long sig[_NSIG_WORDS];
24} sigset_t; 24} sigset_t;
25 25
26struct sigaction { 26#define __ARCH_HAS_SA_RESTORER
27 __sighandler_t sa_handler;
28 unsigned long sa_flags;
29 __sigrestore_t sa_restorer;
30 sigset_t sa_mask; /* mask last for extensibility */
31};
32 27
33#include <asm/sigcontext.h> 28#include <asm/sigcontext.h>
34#undef __HAVE_ARCH_SIG_BITOPS 29#undef __HAVE_ARCH_SIG_BITOPS
diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h
index b0cd904ecd8a..b3650ab2c320 100644
--- a/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@ -23,12 +23,7 @@ struct old_sigaction {
23 void (*sa_restorer)(void); 23 void (*sa_restorer)(void);
24}; 24};
25 25
26struct sigaction { 26#define __ARCH_HAS_SA_RESTORER
27 __sighandler_t sa_handler;
28 unsigned long sa_flags;
29 void (*sa_restorer)(void);
30 sigset_t sa_mask; /* mask last for extensibility */
31};
32 27
33#include <asm/sigcontext.h> 28#include <asm/sigcontext.h>
34 29
diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h
index c05f937bb492..9b18a0959461 100644
--- a/arch/h8300/include/asm/signal.h
+++ b/arch/h8300/include/asm/signal.h
@@ -23,12 +23,7 @@ struct old_sigaction {
23 void (*sa_restorer)(void); 23 void (*sa_restorer)(void);
24}; 24};
25 25
26struct sigaction { 26#define __ARCH_HAS_SA_RESTORER
27 __sighandler_t sa_handler;
28 unsigned long sa_flags;
29 void (*sa_restorer)(void);
30 sigset_t sa_mask; /* mask last for extensibility */
31};
32 27
33#include <asm/sigcontext.h> 28#include <asm/sigcontext.h>
34#undef __HAVE_ARCH_SIG_BITOPS 29#undef __HAVE_ARCH_SIG_BITOPS
diff --git a/arch/ia64/include/asm/signal.h b/arch/ia64/include/asm/signal.h
index a0d5f00ec8db..c62afa4a0dc2 100644
--- a/arch/ia64/include/asm/signal.h
+++ b/arch/ia64/include/asm/signal.h
@@ -26,12 +26,6 @@ typedef struct {
26 unsigned long sig[_NSIG_WORDS]; 26 unsigned long sig[_NSIG_WORDS];
27} sigset_t; 27} sigset_t;
28 28
29struct sigaction {
30 __sighandler_t sa_handler;
31 unsigned long sa_flags;
32 sigset_t sa_mask; /* mask last for extensibility */
33};
34
35# include <asm/sigcontext.h> 29# include <asm/sigcontext.h>
36 30
37# endif /* !__ASSEMBLY__ */ 31# endif /* !__ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index bfbb109458be..c827049eb62c 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -47,7 +47,6 @@ asmlinkage unsigned long sys_mmap2(
47 int prot, int flags, 47 int prot, int flags,
48 int fd, long pgoff); 48 int fd, long pgoff);
49struct pt_regs; 49struct pt_regs;
50struct sigaction;
51asmlinkage long sys_ia64_pipe(void); 50asmlinkage long sys_ia64_pipe(void);
52 51
53/* 52/*
diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h
index 4699405f9f82..ed3ded6601e8 100644
--- a/arch/m32r/include/asm/signal.h
+++ b/arch/m32r/include/asm/signal.h
@@ -16,13 +16,7 @@ typedef struct {
16 unsigned long sig[_NSIG_WORDS]; 16 unsigned long sig[_NSIG_WORDS];
17} sigset_t; 17} sigset_t;
18 18
19struct sigaction { 19#define __ARCH_HAS_SA_RESTORER
20 __sighandler_t sa_handler;
21 unsigned long sa_flags;
22 __sigrestore_t sa_restorer;
23 sigset_t sa_mask; /* mask last for extensibility */
24};
25
26#include <asm/sigcontext.h> 20#include <asm/sigcontext.h>
27 21
28#undef __HAVE_ARCH_SIG_BITOPS 22#undef __HAVE_ARCH_SIG_BITOPS
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index 1edd5f358c0f..c7b4fb1fa14d 100644
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -23,12 +23,7 @@ struct old_sigaction {
23 __sigrestore_t sa_restorer; 23 __sigrestore_t sa_restorer;
24}; 24};
25 25
26struct sigaction { 26#define __ARCH_HAS_SA_RESTORER
27 __sighandler_t sa_handler;
28 unsigned long sa_flags;
29 __sigrestore_t sa_restorer;
30 sigset_t sa_mask; /* mask last for extensibility */
31};
32 27
33#include <asm/sigcontext.h> 28#include <asm/sigcontext.h>
34 29
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
index cf4a08062d1d..197f6367c201 100644
--- a/