tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

consolidate kernel-side struct sigaction declarations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 574c4866 92a3ce4a

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