1 files changed, 1 insertions, 142 deletions
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h
index 3eb13be11d8f..189998bb61c4 100644
--- a/arch/powerpc/include/asm/signal.h
+++ b/arch/powerpc/include/asm/signal.h
@@ -1,149 +1,8 @@
 #ifndef _ASM_POWERPC_SIGNAL_H
 #define _ASM_POWERPC_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-#define _NSIG           64
-#ifdef __powerpc64__
-#define _NSIG_BPW       64
-#else
-#define _NSIG_BPW       32
-#endif
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-#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 is not currently supported, but will allow sigaltstack(2).
- * 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     0x04000000U
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-#include <asm-generic/signal-defs.h>
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-};
-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;
-};
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-#ifdef __KERNEL__
 struct pt_regs;
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
-#ifndef __powerpc64__
-/*
- * These are parameters to dbg_sigreturn syscall.  They enable or
- * disable certain debugging things that can be done from signal
- * handlers.  The dbg_sigreturn syscall *must* be called from a
- * SA_SIGINFO signal so the ucontext can be passed to it.  It takes an
- * array of struct sig_dbg_op, which has the debug operations to
- * perform before returning from the signal.
- */
-struct sig_dbg_op {
-        int dbg_type;
-        unsigned long dbg_value;
-};
-/* Enable or disable single-stepping.  The value sets the state. */
-#define SIG_DBG_SINGLE_STEPPING         1
-/* Enable or disable branch tracing.  The value sets the state. */
-#define SIG_DBG_BRANCH_TRACING          2
-#endif /* ! __powerpc64__ */
 #endif /* _ASM_POWERPC_SIGNAL_H */

diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h index 3eb13be11d8f..189998bb61c4 100644 --- a/arch/powerpc/include/asm/signal.h +++ b/arch/powerpc/include/asm/signal.h
@@ -1,149 +1,8 @@
1	#ifndef _ASM_POWERPC_SIGNAL_H	1	#ifndef _ASM_POWERPC_SIGNAL_H
2	#define _ASM_POWERPC_SIGNAL_H	2	#define _ASM_POWERPC_SIGNAL_H
3		3
4	#include <linux/types.h>	4	#include <uapi/asm/signal.h>
5		5
6	#define _NSIG 64
7	#ifdef __powerpc64__
8	#define _NSIG_BPW 64
9	#else
10	#define _NSIG_BPW 32
11	#endif
12	#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
13
14	typedef unsigned long old_sigset_t; /* at least 32 bits */
15
16	typedef struct {
17	unsigned long sig[_NSIG_WORDS];
18	} sigset_t;
19
20	#define SIGHUP 1
21	#define SIGINT 2
22	#define SIGQUIT 3
23	#define SIGILL 4
24	#define SIGTRAP 5
25	#define SIGABRT 6
26	#define SIGIOT 6
27	#define SIGBUS 7
28	#define SIGFPE 8
29	#define SIGKILL 9
30	#define SIGUSR1 10
31	#define SIGSEGV 11
32	#define SIGUSR2 12
33	#define SIGPIPE 13
34	#define SIGALRM 14
35	#define SIGTERM 15
36	#define SIGSTKFLT 16
37	#define SIGCHLD 17
38	#define SIGCONT 18
39	#define SIGSTOP 19
40	#define SIGTSTP 20
41	#define SIGTTIN 21
42	#define SIGTTOU 22
43	#define SIGURG 23
44	#define SIGXCPU 24
45	#define SIGXFSZ 25
46	#define SIGVTALRM 26
47	#define SIGPROF 27
48	#define SIGWINCH 28
49	#define SIGIO 29
50	#define SIGPOLL SIGIO
51	/*
52	#define SIGLOST 29
53	*/
54	#define SIGPWR 30
55	#define SIGSYS 31
56	#define SIGUNUSED 31
57
58	/* These should not be considered constants from userland. */
59	#define SIGRTMIN 32
60	#define SIGRTMAX _NSIG
61
62	/*
63	* SA_FLAGS values:
64	*
65	* SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
66	* SA_RESTART flag to get restarting signals (which were the default long ago)
67	* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
68	* SA_RESETHAND clears the handler when the signal is delivered.
69	* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
70	* SA_NODEFER prevents the current signal from being masked in the handler.
71	*
72	* SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
73	* Unix names RESETHAND and NODEFER respectively.
74	*/
75	#define SA_NOCLDSTOP 0x00000001U
76	#define SA_NOCLDWAIT 0x00000002U
77	#define SA_SIGINFO 0x00000004U
78	#define SA_ONSTACK 0x08000000U
79	#define SA_RESTART 0x10000000U
80	#define SA_NODEFER 0x40000000U
81	#define SA_RESETHAND 0x80000000U
82
83	#define SA_NOMASK SA_NODEFER
84	#define SA_ONESHOT SA_RESETHAND
85
86	#define SA_RESTORER 0x04000000U
87
88	/*
89	* sigaltstack controls
90	*/
91	#define SS_ONSTACK 1
92	#define SS_DISABLE 2
93
94	#define MINSIGSTKSZ 2048
95	#define SIGSTKSZ 8192
96
97	#include <asm-generic/signal-defs.h>
98
99	struct old_sigaction {
100	__sighandler_t sa_handler;
101	old_sigset_t sa_mask;
102	unsigned long sa_flags;
103	__sigrestore_t sa_restorer;
104	};
105
106	struct sigaction {
107	__sighandler_t sa_handler;
108	unsigned long sa_flags;
109	__sigrestore_t sa_restorer;
110	sigset_t sa_mask; /* mask last for extensibility */
111	};
112
113	struct k_sigaction {
114	struct sigaction sa;
115	};
116
117	typedef struct sigaltstack {
118	void __user *ss_sp;
119	int ss_flags;
120	size_t ss_size;
121	} stack_t;
122
123	#ifdef __KERNEL__
124	struct pt_regs;	6	struct pt_regs;
125	#define ptrace_signal_deliver(regs, cookie) do { } while (0)	7	#define ptrace_signal_deliver(regs, cookie) do { } while (0)
126	#endif /* __KERNEL__ */
127
128	#ifndef __powerpc64__
129	/*
130	* These are parameters to dbg_sigreturn syscall. They enable or
131	* disable certain debugging things that can be done from signal
132	* handlers. The dbg_sigreturn syscall must be called from a
133	* SA_SIGINFO signal so the ucontext can be passed to it. It takes an
134	* array of struct sig_dbg_op, which has the debug operations to
135	* perform before returning from the signal.
136	*/
137	struct sig_dbg_op {
138	int dbg_type;
139	unsigned long dbg_value;
140	};
141
142	/* Enable or disable single-stepping. The value sets the state. */
143	#define SIG_DBG_SINGLE_STEPPING 1
144
145	/* Enable or disable branch tracing. The value sets the state. */
146	#define SIG_DBG_BRANCH_TRACING 2
147	#endif /* ! __powerpc64__ */
148
149	#endif /* _ASM_POWERPC_SIGNAL_H */	8	#endif /* _ASM_POWERPC_SIGNAL_H */