aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/tracehook.h8
-rw-r--r--kernel/signal.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 6f8ab7da27c4..84d497297c5f 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -133,10 +133,6 @@ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
133 133
134/** 134/**
135 * tracehook_signal_handler - signal handler setup is complete 135 * tracehook_signal_handler - signal handler setup is complete
136 * @sig: number of signal being delivered
137 * @info: siginfo_t of signal being delivered
138 * @ka: sigaction setting that chose the handler
139 * @regs: user register state
140 * @stepping: nonzero if debugger single-step or block-step in use 136 * @stepping: nonzero if debugger single-step or block-step in use
141 * 137 *
142 * Called by the arch code after a signal handler has been set up. 138 * Called by the arch code after a signal handler has been set up.
@@ -146,9 +142,7 @@ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
146 * Called without locks, shortly before returning to user mode 142 * Called without locks, shortly before returning to user mode
147 * (or handling more signals). 143 * (or handling more signals).
148 */ 144 */
149static inline void tracehook_signal_handler(int sig, siginfo_t *info, 145static inline void tracehook_signal_handler(int stepping)
150 const struct k_sigaction *ka,
151 struct pt_regs *regs, int stepping)
152{ 146{
153 if (stepping) 147 if (stepping)
154 ptrace_notify(SIGTRAP); 148 ptrace_notify(SIGTRAP);
diff --git a/kernel/signal.c b/kernel/signal.c
index a4077e90f19f..c4d47661cc86 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2379,7 +2379,7 @@ void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka,
2379 if (!(ka->sa.sa_flags & SA_NODEFER)) 2379 if (!(ka->sa.sa_flags & SA_NODEFER))
2380 sigaddset(&blocked, sig); 2380 sigaddset(&blocked, sig);
2381 set_current_blocked(&blocked); 2381 set_current_blocked(&blocked);
2382 tracehook_signal_handler(sig, info, ka, regs, stepping); 2382 tracehook_signal_handler(stepping);
2383} 2383}
2384 2384
2385void signal_setup_done(int failed, struct ksignal *ksig, int stepping) 2385void signal_setup_done(int failed, struct ksignal *ksig, int stepping)