Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9a06509 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/arm: Remove tsk parameter from ptrace_break 



The ptrace_break function is always called with tsk == current.
Make that obvious by removing the tsk parameter.

This also makes it clear that ptrace_break calls force_sig_fault
on the current task.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 07bd88a9

arch/arm/include/asm/traps.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline int __in_irqentry_text(unsigned long ptr) 


extern void __init early_trap_init(void *);

extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame);

extern void ptrace_break(struct task_struct *tsk, struct pt_regs *regs);

extern void ptrace_break(struct pt_regs *regs);



extern void *vectors_page;

arch/arm/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -201,15 +201,15 @@ void ptrace_disable(struct task_struct *child) 
/*

 * Handle hitting a breakpoint.

 */

void ptrace_break(struct task_struct *tsk, struct pt_regs *regs)

void ptrace_break(struct pt_regs *regs)

{

	force_sig_fault(SIGTRAP, TRAP_BRKPT,

			(void __user *)instruction_pointer(regs), tsk);

			(void __user *)instruction_pointer(regs), current);

}



static int break_trap(struct pt_regs *regs, unsigned int instr)

{

	ptrace_break(current, regs);

	ptrace_break(regs);

	return 0;

}

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 


	case NR(breakpoint): /* SWI BREAK_POINT */

		regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;

		ptrace_break(current, regs);

		ptrace_break(regs);

		return regs->ARM_r0;



	/*