UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric W. Biederman 2018-09-22 00:38:41 +02:00
parent 6fa998e83e
commit 24b8f79dd8
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/include/asm/traps.h
View File

@ -37,8 +37,7 @@ void register_undef_hook(struct undef_hook *hook);
void unregister_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 force_signal_inject(int signal, int code, unsigned long address);
void arm64_notify_segfault(unsigned long addr); void arm64_notify_segfault(unsigned long addr);
void arm64_force_sig_info(struct siginfo *info, const char *str, void arm64_force_sig_info(struct siginfo *info, const char *str);
struct task_struct *tsk);
/* /*
* Move regs->pc to next instruction and do necessary setup before it * Move regs->pc to next instruction and do necessary setup before it

2
arch/arm64/kernel/debug-monitors.c
View File

@ -224,7 +224,7 @@ static void send_user_sigtrap(int si_code)
if (interrupts_enabled(regs)) if (interrupts_enabled(regs))
local_irq_enable(); 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, static int single_step_handler(unsigned long addr, unsigned int esr,

2
arch/arm64/kernel/ptrace.c
View File

@ -211,7 +211,7 @@ static void ptrace_hbptriggered(struct perf_event *bp,
force_sig_ptrace_errno_trap(si_errno, (void __user *)bkpt->trigger); force_sig_ptrace_errno_trap(si_errno, (void __user *)bkpt->trigger);
} }
#endif #endif
arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)", current); arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)");
} }
/* /*

8
arch/arm64/kernel/traps.c
View File

@ -231,9 +231,9 @@ static bool show_unhandled_signals_ratelimited(void)
return show_unhandled_signals && __ratelimit(&rs); return show_unhandled_signals && __ratelimit(&rs);
} }
void arm64_force_sig_info(struct siginfo *info, const char *str, void arm64_force_sig_info(struct siginfo *info, const char *str)
struct task_struct *tsk)
{ {
struct task_struct *tsk = current;
unsigned int esr = tsk->thread.fault_code; unsigned int esr = tsk->thread.fault_code;
struct pt_regs *regs = task_pt_regs(tsk); 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_code = sicode;
info.si_addr = addr; info.si_addr = addr;
arm64_force_sig_info(&info, str, current); arm64_force_sig_info(&info, str);
} else { } else {
die(str, regs, err); 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_address = 0;
current->thread.fault_code = esr; 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 #ifdef CONFIG_VMAP_STACK

2
arch/arm64/mm/fault.c
View File

@ -352,7 +352,7 @@ static void __do_user_fault(struct siginfo *info, unsigned int esr)
} }
current->thread.fault_code = 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) static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs)