Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f5e83688
Commit
f5e83688
authored
2 years ago
by
Ard Biesheuvel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: Drop IA64 support from sig_fault handlers
Signed-off-by:
Ard Biesheuvel
<
ardb@kernel.org
>
parent
cf8e8658
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
38 deletions
+9
-38
include/linux/sched/signal.h
include/linux/sched/signal.h
+4
-13
include/uapi/asm-generic/siginfo.h
include/uapi/asm-generic/siginfo.h
+0
-5
kernel/signal.c
kernel/signal.c
+5
-20
No files found.
include/linux/sched/signal.h
View file @
f5e83688
...
...
@@ -303,20 +303,11 @@ static inline void kernel_signal_stop(void)
schedule
();
}
#ifdef __ia64__
# define ___ARCH_SI_IA64(_a1, _a2, _a3) , _a1, _a2, _a3
#else
# define ___ARCH_SI_IA64(_a1, _a2, _a3)
#endif
int
force_sig_fault_to_task
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
)
,
struct
task_struct
*
t
);
int
force_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
));
int
send_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
)
,
struct
task_struct
*
t
);
int
force_sig_fault_to_task
(
int
sig
,
int
code
,
void
__user
*
addr
,
struct
task_struct
*
t
);
int
force_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
);
int
send_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
,
struct
task_struct
*
t
);
int
force_sig_mceerr
(
int
code
,
void
__user
*
,
short
);
int
send_sig_mceerr
(
int
code
,
void
__user
*
,
short
,
struct
task_struct
*
);
...
...
This diff is collapsed.
Click to expand it.
include/uapi/asm-generic/siginfo.h
View file @
f5e83688
...
...
@@ -68,11 +68,6 @@ union __sifields {
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT */
struct
{
void
__user
*
_addr
;
/* faulting insn/memory ref. */
#ifdef __ia64__
int
_imm
;
/* immediate value for "break" */
unsigned
int
_flags
;
/* see ia64 si_flags */
unsigned
long
_isr
;
/* isr */
#endif
#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \
sizeof(short) : __alignof__(void *))
...
...
This diff is collapsed.
Click to expand it.
kernel/signal.c
View file @
f5e83688
...
...
@@ -1718,9 +1718,8 @@ void force_sigsegv(int sig)
force_sig
(
SIGSEGV
);
}
int
force_sig_fault_to_task
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
)
,
struct
task_struct
*
t
)
int
force_sig_fault_to_task
(
int
sig
,
int
code
,
void
__user
*
addr
,
struct
task_struct
*
t
)
{
struct
kernel_siginfo
info
;
...
...
@@ -1729,24 +1728,15 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr
info
.
si_errno
=
0
;
info
.
si_code
=
code
;
info
.
si_addr
=
addr
;
#ifdef __ia64__
info
.
si_imm
=
imm
;
info
.
si_flags
=
flags
;
info
.
si_isr
=
isr
;
#endif
return
force_sig_info_to_task
(
&
info
,
t
,
HANDLER_CURRENT
);
}
int
force_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
))
int
force_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
)
{
return
force_sig_fault_to_task
(
sig
,
code
,
addr
___ARCH_SI_IA64
(
imm
,
flags
,
isr
),
current
);
return
force_sig_fault_to_task
(
sig
,
code
,
addr
,
current
);
}
int
send_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
___ARCH_SI_IA64
(
int
imm
,
unsigned
int
flags
,
unsigned
long
isr
)
,
struct
task_struct
*
t
)
int
send_sig_fault
(
int
sig
,
int
code
,
void
__user
*
addr
,
struct
task_struct
*
t
)
{
struct
kernel_siginfo
info
;
...
...
@@ -1755,11 +1745,6 @@ int send_sig_fault(int sig, int code, void __user *addr
info
.
si_errno
=
0
;
info
.
si_code
=
code
;
info
.
si_addr
=
addr
;
#ifdef __ia64__
info
.
si_imm
=
imm
;
info
.
si_flags
=
flags
;
info
.
si_isr
=
isr
;
#endif
return
send_sig_info
(
info
.
si_signo
,
&
info
,
t
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment