History

consolidate kernel-side struct sigaction declarations

Al Viro committed 13 years ago

Commit 574c4861 parent 92a3ce426 files · +48 −81Browse files

Unified · Split

26 files
  1. arch/alpha/include/asm/signal.h +0 −6
  2. arch/arm/include/asm/signal.h +1 −6
  3. arch/avr32/include/asm/signal.h +1 −6
  4. arch/cris/include/asm/signal.h +1 −6
  5. arch/h8300/include/asm/signal.h +1 −6
  6. arch/ia64/include/asm/signal.h +0 −6
  7. arch/ia64/include/asm/unistd.h +0 −1
  8. arch/m32r/include/asm/signal.h +1 −7
  9. arch/m68k/include/asm/signal.h +1 −6
  10. arch/mips/include/asm/signal.h +2 −0
  11. arch/mips/include/uapi/asm/signal.h +2 −0
  12. arch/mn10300/include/asm/signal.h +1 −6
  13. arch/parisc/include/asm/signal.h +2 −0
  14. arch/powerpc/include/asm/signal.h +1 −0
  15. arch/powerpc/include/asm/syscalls.h +0 −1
  16. arch/powerpc/include/uapi/asm/signal.h +2 −0
  17. arch/s390/include/asm/signal.h +1 −7
  18. arch/sparc/include/asm/signal.h +1 −0
  19. arch/sparc/include/uapi/asm/signal.h +2 −0
  20. arch/sparc/kernel/systbls.h +1 −1
  21. arch/x86/include/asm/signal.h +3 −7
  22. arch/x86/include/uapi/asm/signal.h +2 −2
  23. arch/xtensa/include/asm/signal.h +1 −6
  24. include/linux/signal.h +14 −0
  25. include/linux/syscalls.h +1 −1
  26. include/uapi/asm-generic/signal.h +6 −0
arch/alpha/include/asm/signal.h+0−6
@@ -22,12 +22,6 @@ struct osf_sigaction { · 21 unmodified lines
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_RESTORER25#define __ARCH_HAS_KA_RESTORER
32#include <asm/sigcontext.h>26#include <asm/sigcontext.h>
33#endif27#endif
arch/arm/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
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#endif29#endif
arch/avr32/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ typedef struct { · 22 unmodified lines
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_BITOPS29#undef __HAVE_ARCH_SIG_BITOPS
arch/cris/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
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
arch/h8300/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
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_BITOPS29#undef __HAVE_ARCH_SIG_BITOPS
arch/ia64/include/asm/signal.h+0−6
@@ -26,12 +26,6 @@ typedef struct { · 25 unmodified lines
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__ */
arch/ia64/include/asm/unistd.h+0−1
@@ -47,7 +47,6 @@ asmlinkage unsigned long sys_mmap2( · 46 unmodified lines
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/*
arch/m32r/include/asm/signal.h+1−7
@@ -16,13 +16,7 @@ typedef struct { · 15 unmodified lines
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_BITOPS22#undef __HAVE_ARCH_SIG_BITOPS
arch/m68k/include/asm/signal.h+1−6
@@ -23,12 +23,7 @@ struct old_sigaction { · 22 unmodified lines
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
arch/mips/include/asm/signal.h+2−0
@@ -21,4 +21,6 @@ · 20 unmodified lines
21#include <asm/sigcontext.h>21#include <asm/sigcontext.h>
22#include <asm/siginfo.h>22#include <asm/siginfo.h>
23 23
24#define __ARCH_HAS_ODD_SIGACTION
25
24#endif /* _ASM_SIGNAL_H */26#endif /* _ASM_SIGNAL_H */
arch/mips/include/uapi/asm/signal.h+2−0
@@ -96,11 +96,13 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ · 95 unmodified lines
96 96
97#include <asm-generic/signal-defs.h>97#include <asm-generic/signal-defs.h>
98 98
99#ifndef __KERNEL__
99struct sigaction {100struct sigaction {
100 unsigned int sa_flags;101 unsigned int sa_flags;
101 __sighandler_t sa_handler;102 __sighandler_t sa_handler;
102 sigset_t sa_mask;103 sigset_t sa_mask;
103};104};
105#endif
104 106
105/* IRIX compatible stack_t */107/* IRIX compatible stack_t */
106typedef struct sigaltstack {108typedef struct sigaltstack {
arch/mn10300/include/asm/signal.h+1−6
@@ -33,12 +33,7 @@ struct old_sigaction { · 32 unmodified lines
33 __sigrestore_t sa_restorer;33 __sigrestore_t sa_restorer;
34};34};
35 35
36struct sigaction {36#define __ARCH_HAS_SA_RESTORER
37 __sighandler_t sa_handler;
38 unsigned long sa_flags;
39 __sigrestore_t sa_restorer;
40 sigset_t sa_mask; /* mask last for extensibility */
41};
42 37
43#include <asm/sigcontext.h>38#include <asm/sigcontext.h>
44 39
arch/parisc/include/asm/signal.h+2−0
@@ -24,11 +24,13 @@ typedef struct { · 23 unmodified lines
24 unsigned long sig[_NSIG_WORDS];24 unsigned long sig[_NSIG_WORDS];
25} sigset_t;25} sigset_t;
26 26
27#ifndef __KERNEL__
27struct sigaction {28struct sigaction {
28 __sighandler_t sa_handler;29 __sighandler_t sa_handler;
29 unsigned long sa_flags;30 unsigned long sa_flags;
30 sigset_t sa_mask; /* mask last for extensibility */31 sigset_t sa_mask; /* mask last for extensibility */
31};32};
33#endif
32 34
33#include <asm/sigcontext.h>35#include <asm/sigcontext.h>
34 36
arch/powerpc/include/asm/signal.h+1−0
@@ -1,6 +1,7 @@
1#ifndef _ASM_POWERPC_SIGNAL_H1#ifndef _ASM_POWERPC_SIGNAL_H
2#define _ASM_POWERPC_SIGNAL_H2#define _ASM_POWERPC_SIGNAL_H
3 3
4#define __ARCH_HAS_SA_RESTORER
4#include <uapi/asm/signal.h>5#include <uapi/asm/signal.h>
5 6
6#endif /* _ASM_POWERPC_SIGNAL_H */7#endif /* _ASM_POWERPC_SIGNAL_H */
arch/powerpc/include/asm/syscalls.h+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
9 9
10struct pt_regs;10struct pt_regs;
11struct rtas_args;11struct rtas_args;
12struct sigaction;
13 12
14asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,13asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,
15 unsigned long prot, unsigned long flags,14 unsigned long prot, unsigned long flags,
arch/powerpc/include/uapi/asm/signal.h+2−0
@@ -97,12 +97,14 @@ struct old_sigaction { · 96 unmodified lines
97 __sigrestore_t sa_restorer;97 __sigrestore_t sa_restorer;
98};98};
99 99
100#ifndef __KERNEL__
100struct sigaction {101struct sigaction {
101 __sighandler_t sa_handler;102 __sighandler_t sa_handler;
102 unsigned long sa_flags;103 unsigned long sa_flags;
103 __sigrestore_t sa_restorer;104 __sigrestore_t sa_restorer;
104 sigset_t sa_mask; /* mask last for extensibility */105 sigset_t sa_mask; /* mask last for extensibility */
105};106};
107#endif
106 108
107typedef struct sigaltstack {109typedef struct sigaltstack {
108 void __user *ss_sp;110 void __user *ss_sp;
arch/s390/include/asm/signal.h+1−7
@@ -28,11 +28,5 @@ struct old_sigaction { · 27 unmodified lines
28 void (*sa_restorer)(void);28 void (*sa_restorer)(void);
29};29};
30 30
31struct sigaction {31#define __ARCH_HAS_SA_RESTORER
32 __sighandler_t sa_handler;
33 unsigned long sa_flags;
34 void (*sa_restorer)(void);
35 sigset_t sa_mask; /* mask last for extensibility */
36};
37
38#endif32#endif
arch/sparc/include/asm/signal.h+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#define SA_STATIC_ALLOC 0x800022#define SA_STATIC_ALLOC 0x8000
23 23
24#define __ARCH_HAS_KA_RESTORER24#define __ARCH_HAS_KA_RESTORER
25#define __ARCH_HAS_SA_RESTORER
25 26
26#endif /* !(__ASSEMBLY__) */27#endif /* !(__ASSEMBLY__) */
27#endif /* !(__SPARC_SIGNAL_H) */28#endif /* !(__SPARC_SIGNAL_H) */
arch/sparc/include/uapi/asm/signal.h+2−0
@@ -153,12 +153,14 @@ struct sigstack { · 152 unmodified lines
153 153
154#include <asm-generic/signal-defs.h>154#include <asm-generic/signal-defs.h>
155 155
156#ifndef __KERNEL__
156struct __new_sigaction {157struct __new_sigaction {
157 __sighandler_t sa_handler;158 __sighandler_t sa_handler;
158 unsigned long sa_flags;159 unsigned long sa_flags;
159 __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */160 __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */
160 __new_sigset_t sa_mask;161 __new_sigset_t sa_mask;
161};162};
163#endif
162 164
163struct __old_sigaction {165struct __old_sigaction {
164 __sighandler_t sa_handler;166 __sighandler_t sa_handler;
arch/sparc/kernel/systbls.h+1−1
@@ -3,8 +3,8 @@ · 2 unmodified lines
3 3
4#include <linux/kernel.h>4#include <linux/kernel.h>
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/signal.h>
6#include <asm/utrap.h>7#include <asm/utrap.h>
7#include <asm/signal.h>
8 8
9extern asmlinkage unsigned long sys_getpagesize(void);9extern asmlinkage unsigned long sys_getpagesize(void);
10extern asmlinkage long sparc_pipe(struct pt_regs *regs);10extern asmlinkage long sparc_pipe(struct pt_regs *regs);
arch/x86/include/asm/signal.h+3−7
@@ -31,6 +31,9 @@ typedef sigset_t compat_sigset_t; · 30 unmodified lines
31#include <uapi/asm/signal.h>31#include <uapi/asm/signal.h>
32#ifndef __ASSEMBLY__32#ifndef __ASSEMBLY__
33extern void do_notify_resume(struct pt_regs *, void *, __u32);33extern void do_notify_resume(struct pt_regs *, void *, __u32);
34
35#define __ARCH_HAS_SA_RESTORER
36
34#ifdef __i386__37#ifdef __i386__
35struct old_sigaction {38struct old_sigaction {
36 __sighandler_t sa_handler;39 __sighandler_t sa_handler;
@@ -39,13 +42,6 @@ struct old_sigaction { · 2 unmodified lines
39 __sigrestore_t sa_restorer;42 __sigrestore_t sa_restorer;
40};43};
41 44
42struct sigaction {
43 __sighandler_t sa_handler;
44 unsigned long sa_flags;
45 __sigrestore_t sa_restorer;
46 sigset_t sa_mask; /* mask last for extensibility */
47};
48
49#endif /* !__i386__ */45#endif /* !__i386__ */
50#include <asm/sigcontext.h>46#include <asm/sigcontext.h>
51 47
arch/x86/include/uapi/asm/signal.h+2−2
@@ -95,9 +95,9 @@ typedef unsigned long sigset_t; · 94 unmodified lines
95#ifndef __ASSEMBLY__95#ifndef __ASSEMBLY__
96 96
97 97
98#ifdef __i386__
99# ifndef __KERNEL__98# ifndef __KERNEL__
100/* Here we must cater to libcs that poke about in kernel headers. */99/* Here we must cater to libcs that poke about in kernel headers. */
100#ifdef __i386__
101 101
102struct sigaction {102struct sigaction {
103 union {103 union {
@@ -112,7 +112,6 @@ struct sigaction { · 8 unmodified lines
112#define sa_handler _u._sa_handler112#define sa_handler _u._sa_handler
113#define sa_sigaction _u._sa_sigaction113#define sa_sigaction _u._sa_sigaction
114 114
115# endif /* ! __KERNEL__ */
116#else /* __i386__ */115#else /* __i386__ */
117 116
118struct sigaction {117struct sigaction {
@@ -123,6 +122,7 @@ struct sigaction { · 4 unmodified lines
123};122};
124 123
125#endif /* !__i386__ */124#endif /* !__i386__ */
125# endif /* ! __KERNEL__ */
126 126
127typedef struct sigaltstack {127typedef struct sigaltstack {
128 void __user *ss_sp;128 void __user *ss_sp;
arch/xtensa/include/asm/signal.h+1−6
@@ -15,12 +15,7 @@ · 14 unmodified lines
15#include <uapi/asm/signal.h>15#include <uapi/asm/signal.h>
16 16
17#ifndef __ASSEMBLY__17#ifndef __ASSEMBLY__
18struct sigaction {18#define __ARCH_HAS_SA_RESTORER
19 __sighandler_t sa_handler;
20 unsigned long sa_flags;
21 void (*sa_restorer)(void);
22 sigset_t sa_mask; /* mask last for extensibility */
23};
24 19
25#include <asm/sigcontext.h>20#include <asm/sigcontext.h>
26 21
include/linux/signal.h+14−0
@@ -249,6 +249,20 @@ extern void __set_current_blocked(const sigset_t *); · 248 unmodified lines
249extern int show_unhandled_signals;249extern int show_unhandled_signals;
250extern int sigsuspend(sigset_t *);250extern int sigsuspend(sigset_t *);
251 251
252struct sigaction {
253#ifndef __ARCH_HAS_ODD_SIGACTION
254 __sighandler_t sa_handler;
255 unsigned long sa_flags;
256#else
257 unsigned long sa_flags;
258 __sighandler_t sa_handler;
259#endif
260#ifdef __ARCH_HAS_SA_RESTORER
261 __sigrestore_t sa_restorer;
262#endif
263 sigset_t sa_mask; /* mask last for extensibility */
264};
265
252struct k_sigaction {266struct k_sigaction {
253 struct sigaction sa;267 struct sigaction sa;
254#ifdef __ARCH_HAS_KA_RESTORER268#ifdef __ARCH_HAS_KA_RESTORER
include/linux/syscalls.h+1−1
@@ -68,11 +68,11 @@ struct sigaltstack; · 67 unmodified lines
68#include <linux/types.h>68#include <linux/types.h>
69#include <linux/aio_abi.h>69#include <linux/aio_abi.h>
70#include <linux/capability.h>70#include <linux/capability.h>
71#include <linux/signal.h>
71#include <linux/list.h>72#include <linux/list.h>
72#include <linux/bug.h>73#include <linux/bug.h>
73#include <linux/sem.h>74#include <linux/sem.h>
74#include <asm/siginfo.h>75#include <asm/siginfo.h>
75#include <asm/signal.h>
76#include <linux/unistd.h>76#include <linux/unistd.h>
77#include <linux/quota.h>77#include <linux/quota.h>
78#include <linux/key.h>78#include <linux/key.h>
include/uapi/asm-generic/signal.h+6−0
@@ -93,6 +93,11 @@ typedef unsigned long old_sigset_t; · 92 unmodified lines
93 93
94#include <asm-generic/signal-defs.h>94#include <asm-generic/signal-defs.h>
95 95
96#ifdef SA_RESTORER
97#define __ARCH_HAS_SA_RESTORER
98#endif
99
100#ifndef __KERNEL__
96struct sigaction {101struct sigaction {
97 __sighandler_t sa_handler;102 __sighandler_t sa_handler;
98 unsigned long sa_flags;103 unsigned long sa_flags;
@@ -101,6 +106,7 @@ struct sigaction { · 2 unmodified lines
101#endif106#endif
102 sigset_t sa_mask; /* mask last for extensibility */107 sigset_t sa_mask; /* mask last for extensibility */
103};108};
109#endif
104 110
105typedef struct sigaltstack {111typedef struct sigaltstack {
106 void __user *ss_sp;112 void __user *ss_sp;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t