signal/parisc: Use force_sig_fault where appropriate
Filling in struct siginfo before calling force_sig_info a tedious and error prone process, where once in a great while the wrong fields are filled out, and siginfo has been inconsistently cleared. Simplify this process by using the helper force_sig_fault. Which takes as a parameters all of the information it needs, ensures all of the fiddly bits of filling in struct siginfo are done properly and then calls force_sig_info. In short about a 5 line reduction in code for every time force_sig_info is called, which makes the calling function clearer. Cc: James Bottomley <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Acked-by: Helge Deller <deller@gmx.de> # parisc Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
@@ -76,8 +76,6 @@ void user_enable_single_step(struct task_struct *task)
|
||||
set_tsk_thread_flag(task, TIF_SINGLESTEP);
|
||||
|
||||
if (pa_psw(task)->n) {
|
||||
struct siginfo si;
|
||||
|
||||
/* Nullified, just crank over the queue. */
|
||||
task_regs(task)->iaoq[0] = task_regs(task)->iaoq[1];
|
||||
task_regs(task)->iasq[0] = task_regs(task)->iasq[1];
|
||||
@@ -90,12 +88,9 @@ void user_enable_single_step(struct task_struct *task)
|
||||
ptrace_disable(task);
|
||||
/* Don't wake up the task, but let the
|
||||
parent know something happened. */
|
||||
clear_siginfo(&si);
|
||||
si.si_code = TRAP_TRACE;
|
||||
si.si_addr = (void __user *) (task_regs(task)->iaoq[0] & ~3);
|
||||
si.si_signo = SIGTRAP;
|
||||
si.si_errno = 0;
|
||||
force_sig_info(SIGTRAP, &si, task);
|
||||
force_sig_fault(SIGTRAP, TRAP_TRACE,
|
||||
(void __user *) (task_regs(task)->iaoq[0] & ~3),
|
||||
task);
|
||||
/* notify_parent(task, SIGCHLD); */
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user