Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
[cascardo/linux.git] / include / linux / tracehook.h
index 6f8ab7d..84d4972 100644 (file)
@@ -133,10 +133,6 @@ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
 
 /**
  * tracehook_signal_handler - signal handler setup is complete
- * @sig:               number of signal being delivered
- * @info:              siginfo_t of signal being delivered
- * @ka:                        sigaction setting that chose the handler
- * @regs:              user register state
  * @stepping:          nonzero if debugger single-step or block-step in use
  *
  * 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)
  * Called without locks, shortly before returning to user mode
  * (or handling more signals).
  */
-static inline void tracehook_signal_handler(int sig, siginfo_t *info,
-                                           const struct k_sigaction *ka,
-                                           struct pt_regs *regs, int stepping)
+static inline void tracehook_signal_handler(int stepping)
 {
        if (stepping)
                ptrace_notify(SIGTRAP);