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>

diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h
index a00288d75ee6ad7349d7813a8691b77c2a1ca7ec..172b08ff3760d43bc46306b630a64646b65d5a72 100644 (file)
--- a/arch/arm/include/asm/traps.h
+++ b/arch/arm/include/asm/traps.h
@@ -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;
 

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 6fa5b6387556d6e640b6b07bb3d4aa28e1e3f2c4..f9cbd08a9075e0f4c7161caca5f942b06e4113bc 100644 (file)
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -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;
 }
 

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 33af097c454bd53f6beea7419b76953e3228616d..288989c7355d5a061849d8470d5ee83e23f6dce3 100644 (file)
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -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;
 
        /*