Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kernel: Drop IA64 support from sig_fault handlers
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
+9
-38
+4
-13
include/linux/sched/signal.h
+4
-13
include/linux/sched/signal.h
···
303
303
304
304
schedule();
305
305
}
306
-
#ifdef __ia64__
307
-
# define ___ARCH_SI_IA64(_a1, _a2, _a3) , _a1, _a2, _a3
308
-
#else
309
-
# define ___ARCH_SI_IA64(_a1, _a2, _a3)
310
-
#endif
311
306
312
-
int force_sig_fault_to_task(int sig, int code, void __user *addr
313
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
314
-
, struct task_struct *t);
315
-
int force_sig_fault(int sig, int code, void __user *addr
316
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr));
317
-
int send_sig_fault(int sig, int code, void __user *addr
318
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
319
-
, struct task_struct *t);
307
+
int force_sig_fault_to_task(int sig, int code, void __user *addr,
308
+
struct task_struct *t);
309
+
int force_sig_fault(int sig, int code, void __user *addr);
310
+
int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t);
320
311
321
312
int force_sig_mceerr(int code, void __user *, short);
322
313
int send_sig_mceerr(int code, void __user *, short, struct task_struct *);
-5
include/uapi/asm-generic/siginfo.h
-5
include/uapi/asm-generic/siginfo.h
···
68
68
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT */
69
69
struct {
70
70
void __user *_addr; /* faulting insn/memory ref. */
71
-
#ifdef __ia64__
72
-
int _imm; /* immediate value for "break" */
73
-
unsigned int _flags; /* see ia64 si_flags */
74
-
unsigned long _isr; /* isr */
75
-
#endif
76
71
77
72
#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \
78
73
sizeof(short) : __alignof__(void *))
+5
-20
kernel/signal.c
+5
-20
kernel/signal.c
···
1718
1718
force_sig(SIGSEGV);
1719
1719
}
1720
1720
1721
-
int force_sig_fault_to_task(int sig, int code, void __user *addr
1722
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
1723
-
, struct task_struct *t)
1721
+
int force_sig_fault_to_task(int sig, int code, void __user *addr,
1722
+
struct task_struct *t)
1724
1723
{
1725
1724
struct kernel_siginfo info;
1726
1725
···
1728
1729
info.si_errno = 0;
1729
1730
info.si_code = code;
1730
1731
info.si_addr = addr;
1731
-
#ifdef __ia64__
1732
-
info.si_imm = imm;
1733
-
info.si_flags = flags;
1734
-
info.si_isr = isr;
1735
-
#endif
1736
1732
return force_sig_info_to_task(&info, t, HANDLER_CURRENT);
1737
1733
}
1738
1734
1739
-
int force_sig_fault(int sig, int code, void __user *addr
1740
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr))
1735
+
int force_sig_fault(int sig, int code, void __user *addr)
1741
1736
{
1742
-
return force_sig_fault_to_task(sig, code, addr
1743
-
___ARCH_SI_IA64(imm, flags, isr), current);
1737
+
return force_sig_fault_to_task(sig, code, addr, current);
1744
1738
}
1745
1739
1746
-
int send_sig_fault(int sig, int code, void __user *addr
1747
-
___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
1748
-
, struct task_struct *t)
1740
+
int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t)
1749
1741
{
1750
1742
struct kernel_siginfo info;
1751
1743
···
1745
1755
info.si_errno = 0;
1746
1756
info.si_code = code;
1747
1757
info.si_addr = addr;
1748
-
#ifdef __ia64__
1749
-
info.si_imm = imm;
1750
-
info.si_flags = flags;
1751
-
info.si_isr = isr;
1752
-
#endif
1753
1758
return send_sig_info(info.si_signo, &info, t);
1754
1759
}
1755
1760