signal/arm64: Remove unneeded tsk parameter from arm64_force_sig_info

Every caller passes in current for tsk so there is no need to pass
tsk.  Instead make tsk a local variable initialized to current.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h
index c320f3bf6c57c6eef3e91c0a92706a6ebc09cf2b..cd3a2ca9c1796f099c59cc8c2194b6e6ac750c3d 100644 (file)
--- a/arch/arm64/include/asm/traps.h
+++ b/arch/arm64/include/asm/traps.h
@@ -37,8 +37,7 @@ void register_undef_hook(struct undef_hook *hook);
 void unregister_undef_hook(struct undef_hook *hook);
 void force_signal_inject(int signal, int code, unsigned long address);
 void arm64_notify_segfault(unsigned long addr);
-void arm64_force_sig_info(struct siginfo *info, const char *str,
-                         struct task_struct *tsk);
+void arm64_force_sig_info(struct siginfo *info, const char *str);
 
 /*
  * Move regs->pc to next instruction and do necessary setup before it

diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 06ca574495af9f6c67e841a188b1f6d13f5f1f9d..e0d9502be5bf9546efcd176a7fe049713cfa135d 100644 (file)
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -224,7 +224,7 @@ static void send_user_sigtrap(int si_code)
        if (interrupts_enabled(regs))
                local_irq_enable();
 
-       arm64_force_sig_info(&info, "User debug trap", current);
+       arm64_force_sig_info(&info, "User debug trap");
 }
 
 static int single_step_handler(unsigned long addr, unsigned int esr,

diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 6219486fa25fa4490d4397f6aee15e18fc208559..20b68cb31ecbfef699537fefdf1540e7f526ee75 100644 (file)
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -211,7 +211,7 @@ static void ptrace_hbptriggered(struct perf_event *bp,
                force_sig_ptrace_errno_trap(si_errno, (void __user *)bkpt->trigger);
        }
 #endif
-       arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)", current);
+       arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)");
 }
 
 /*

diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 459eb6fb715847595ca944ab1e9ba75dfc3ad928..24035d124608b0f9572dcb17be9d958c220a8175 100644 (file)
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -231,9 +231,9 @@ static bool show_unhandled_signals_ratelimited(void)
        return show_unhandled_signals && __ratelimit(&rs);
 }
 
-void arm64_force_sig_info(struct siginfo *info, const char *str,
-                         struct task_struct *tsk)
+void arm64_force_sig_info(struct siginfo *info, const char *str)
 {
+       struct task_struct *tsk = current;
        unsigned int esr = tsk->thread.fault_code;
        struct pt_regs *regs = task_pt_regs(tsk);
 
@@ -273,7 +273,7 @@ void arm64_notify_die(const char *str, struct pt_regs *regs,
                info.si_code  = sicode;
                info.si_addr  = addr;
 
-               arm64_force_sig_info(&info, str, current);
+               arm64_force_sig_info(&info, str);
        } else {
                die(str, regs, err);
        }
@@ -630,7 +630,7 @@ asmlinkage void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr)
        current->thread.fault_address = 0;
        current->thread.fault_code = esr;
 
-       arm64_force_sig_info(&info, "Bad EL0 synchronous exception", current);
+       arm64_force_sig_info(&info, "Bad EL0 synchronous exception");
 }
 
 #ifdef CONFIG_VMAP_STACK

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 86fe70d8722f7e98cce730468774e22d65bdd67a..f42aff0e90ad6abb7e8022022f3db032644e74fe 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -352,7 +352,7 @@ static void __do_user_fault(struct siginfo *info, unsigned int esr)
        }
 
        current->thread.fault_code = esr;
-       arm64_force_sig_info(info, esr_to_fault_info(esr)->name, current);
+       arm64_force_sig_info(info, esr_to_fault_info(esr)->name);
 }
 
 static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs)