Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: "Eric W. Biederman" <ebiederm@xmission.com>

+5 -5
+1 -1
arch/arm/include/asm/traps.h
··· 30 30 31 31 extern void __init early_trap_init(void *); 32 32 extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame); 33 - extern void ptrace_break(struct task_struct *tsk, struct pt_regs *regs); 33 + extern void ptrace_break(struct pt_regs *regs); 34 34 35 35 extern void *vectors_page; 36 36
+3 -3
arch/arm/kernel/ptrace.c
··· 201 201 /* 202 202 * Handle hitting a breakpoint. 203 203 */ 204 - void ptrace_break(struct task_struct *tsk, struct pt_regs *regs) 204 + void ptrace_break(struct pt_regs *regs) 205 205 { 206 206 force_sig_fault(SIGTRAP, TRAP_BRKPT, 207 - (void __user *)instruction_pointer(regs), tsk); 207 + (void __user *)instruction_pointer(regs), current); 208 208 } 209 209 210 210 static int break_trap(struct pt_regs *regs, unsigned int instr) 211 211 { 212 - ptrace_break(current, regs); 212 + ptrace_break(regs); 213 213 return 0; 214 214 } 215 215
+1 -1
arch/arm/kernel/traps.c
··· 606 606 607 607 case NR(breakpoint): /* SWI BREAK_POINT */ 608 608 regs->ARM_pc -= thumb_mode(regs) ? 2 : 4; 609 - ptrace_break(current, regs); 609 + ptrace_break(regs); 610 610 return regs->ARM_r0; 611 611 612 612 /*