1 files changed, 0 insertions, 139 deletions
diff --git a/include/asm-ia64/siginfo.h b/include/asm-ia64/siginfo.h
deleted file mode 100644
index 9294e4b0c8bc..000000000000
--- a/include/asm-ia64/siginfo.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef _ASM_IA64_SIGINFO_H
-#define _ASM_IA64_SIGINFO_H
-/*
- * Based on <asm-i386/siginfo.h>.
- *
- * Modified 1998-2002
- *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
- */
-#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
-#define HAVE_ARCH_SIGINFO_T
-#define HAVE_ARCH_COPY_SIGINFO
-#define HAVE_ARCH_COPY_SIGINFO_TO_USER
-#include <asm-generic/siginfo.h>
-typedef struct siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-        int __pad0;
-        union {
-                int _pad[SI_PAD_SIZE];
-                /* kill() */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        uid_t _uid;             /* sender's uid */
-                } _kill;
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* must overlay ._rt._sigval! */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-                /* POSIX.1b signals */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        uid_t _uid;             /* sender's uid */
-                        sigval_t _sigval;
-                } _rt;
-                /* SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        uid_t _uid;             /* sender's uid */
-                        int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
-                } _sigchld;
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void __user *_addr;     /* faulting insn/memory ref. */
-                        int _imm;               /* immediate value for "break" */
-                        unsigned int _flags;    /* see below */
-                        unsigned long _isr;     /* isr */
-                } _sigfault;
-                /* SIGPOLL */
-                struct {
-                        long _band;     /* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} siginfo_t;
-#define si_imm          _sifields._sigfault._imm        /* as per UNIX SysV ABI spec */
-#define si_flags        _sifields._sigfault._flags
-/*
- * si_isr is valid for SIGILL, SIGFPE, SIGSEGV, SIGBUS, and SIGTRAP provided that
- * si_code is non-zero and __ISR_VALID is set in si_flags.
- */
-#define si_isr          _sifields._sigfault._isr
-/*
- * Flag values for si_flags:
- */
-#define __ISR_VALID_BIT 0
-#define __ISR_VALID     (1 << __ISR_VALID_BIT)
-/*
- * SIGILL si_codes
- */
-#define ILL_BADIADDR    (__SI_FAULT|9)  /* unimplemented instruction address */
-#define __ILL_BREAK     (__SI_FAULT|10) /* illegal break */
-#define __ILL_BNDMOD    (__SI_FAULT|11) /* bundle-update (modification) in progress */
-#undef NSIGILL
-#define NSIGILL         11
-/*
- * SIGFPE si_codes
- */
-#define __FPE_DECOVF    (__SI_FAULT|9)  /* decimal overflow */
-#define __FPE_DECDIV    (__SI_FAULT|10) /* decimal division by zero */
-#define __FPE_DECERR    (__SI_FAULT|11) /* packed decimal error */
-#define __FPE_INVASC    (__SI_FAULT|12) /* invalid ASCII digit */
-#define __FPE_INVDEC    (__SI_FAULT|13) /* invalid decimal digit */
-#undef NSIGFPE
-#define NSIGFPE         13
-/*
- * SIGSEGV si_codes
- */
-#define __SEGV_PSTKOVF  (__SI_FAULT|3)  /* paragraph stack overflow */
-#undef NSIGSEGV
-#define NSIGSEGV        3
-/*
- * SIGTRAP si_codes
- */
-#define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
-#define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint or watchpoint */
-#undef NSIGTRAP
-#define NSIGTRAP        4
-#ifdef __KERNEL__
-#include <linux/string.h>
-static inline void
-copy_siginfo (siginfo_t *to, siginfo_t *from)
-{
-        if (from->si_code < 0)
-                memcpy(to, from, sizeof(siginfo_t));
-        else
-                /* _sigchld is currently the largest know union member */
-                memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld));
-}
-#endif /* __KERNEL__ */
-#endif /* _ASM_IA64_SIGINFO_H */

diff --git a/include/asm-ia64/siginfo.h b/include/asm-ia64/siginfo.h deleted file mode 100644 index 9294e4b0c8bc..000000000000 --- a/include/asm-ia64/siginfo.h +++ /dev/null
@@ -1,139 +0,0 @@
1	#ifndef _ASM_IA64_SIGINFO_H
2	#define _ASM_IA64_SIGINFO_H
3
4	/*
5	* Based on <asm-i386/siginfo.h>.
6	*
7	* Modified 1998-2002
8	* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
9	*/
10
11	#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
12
13	#define HAVE_ARCH_SIGINFO_T
14	#define HAVE_ARCH_COPY_SIGINFO
15	#define HAVE_ARCH_COPY_SIGINFO_TO_USER
16
17	#include <asm-generic/siginfo.h>
18
19	typedef struct siginfo {
20	int si_signo;
21	int si_errno;
22	int si_code;
23	int __pad0;
24
25	union {
26	int _pad[SI_PAD_SIZE];
27
28	/* kill() */
29	struct {
30	pid_t _pid; /* sender's pid */
31	uid_t _uid; /* sender's uid */
32	} _kill;
33
34	/* POSIX.1b timers */
35	struct {
36	timer_t _tid; /* timer id */
37	int _overrun; /* overrun count */
38	char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
39	sigval_t _sigval; /* must overlay ._rt._sigval! */
40	int _sys_private; /* not to be passed to user */
41	} _timer;
42
43	/* POSIX.1b signals */
44	struct {
45	pid_t _pid; /* sender's pid */
46	uid_t _uid; /* sender's uid */
47	sigval_t _sigval;
48	} _rt;
49
50	/* SIGCHLD */
51	struct {
52	pid_t _pid; /* which child */
53	uid_t _uid; /* sender's uid */
54	int _status; /* exit code */
55	clock_t _utime;
56	clock_t _stime;
57	} _sigchld;
58
59	/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
60	struct {
61	void __user _addr; / faulting insn/memory ref. */
62	int _imm; /* immediate value for "break" */
63	unsigned int _flags; /* see below */
64	unsigned long _isr; /* isr */
65	} _sigfault;
66
67	/* SIGPOLL */
68	struct {
69	long _band; /* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */
70	int _fd;
71	} _sigpoll;
72	} _sifields;
73	} siginfo_t;
74
75	#define si_imm _sifields._sigfault._imm /* as per UNIX SysV ABI spec */
76	#define si_flags _sifields._sigfault._flags
77	/*
78	* si_isr is valid for SIGILL, SIGFPE, SIGSEGV, SIGBUS, and SIGTRAP provided that
79	* si_code is non-zero and __ISR_VALID is set in si_flags.
80	*/
81	#define si_isr _sifields._sigfault._isr
82
83	/*
84	* Flag values for si_flags:
85	*/
86	#define __ISR_VALID_BIT 0
87	#define __ISR_VALID (1 << __ISR_VALID_BIT)
88
89	/*
90	* SIGILL si_codes
91	*/
92	#define ILL_BADIADDR (__SI_FAULT\|9) /* unimplemented instruction address */
93	#define __ILL_BREAK (__SI_FAULT\|10) /* illegal break */
94	#define __ILL_BNDMOD (__SI_FAULT\|11) /* bundle-update (modification) in progress */
95	#undef NSIGILL
96	#define NSIGILL 11
97
98	/*
99	* SIGFPE si_codes
100	*/
101	#define __FPE_DECOVF (__SI_FAULT\|9) /* decimal overflow */
102	#define __FPE_DECDIV (__SI_FAULT\|10) /* decimal division by zero */
103	#define __FPE_DECERR (__SI_FAULT\|11) /* packed decimal error */
104	#define __FPE_INVASC (__SI_FAULT\|12) /* invalid ASCII digit */
105	#define __FPE_INVDEC (__SI_FAULT\|13) /* invalid decimal digit */
106	#undef NSIGFPE
107	#define NSIGFPE 13
108
109	/*
110	* SIGSEGV si_codes
111	*/
112	#define __SEGV_PSTKOVF (__SI_FAULT\|3) /* paragraph stack overflow */
113	#undef NSIGSEGV
114	#define NSIGSEGV 3
115
116	/*
117	* SIGTRAP si_codes
118	*/
119	#define TRAP_BRANCH (__SI_FAULT\|3) /* process taken branch trap */
120	#define TRAP_HWBKPT (__SI_FAULT\|4) /* hardware breakpoint or watchpoint */
121	#undef NSIGTRAP
122	#define NSIGTRAP 4
123
124	#ifdef __KERNEL__
125	#include <linux/string.h>
126
127	static inline void
128	copy_siginfo (siginfo_t to, siginfo_t from)
129	{
130	if (from->si_code < 0)
131	memcpy(to, from, sizeof(siginfo_t));
132	else
133	/* _sigchld is currently the largest know union member */
134	memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld));
135	}
136
137	#endif /* __KERNEL__ */
138
139	#endif /* _ASM_IA64_SIGINFO_H */