diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 19:17:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 19:17:47 -0700 |
| commit | 0afe832e55a70f4bc5e725db400779b4f620290c (patch) | |
| tree | a656975173d7ed2cc65ef3cf38c16be48c81b85a /arch/x86/kernel/uprobes.c | |
| parent | 42964c6f6261f6b44bb43cabc93ac9e39b5a9a54 (diff) | |
| parent | 844ea8f62619ac2a5e47d13e3449ac197067b414 (diff) | |
| download | linux-0afe832e55a70f4bc5e725db400779b4f620290c.tar.gz linux-0afe832e55a70f4bc5e725db400779b4f620290c.tar.bz2 linux-0afe832e55a70f4bc5e725db400779b4f620290c.zip | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apm: Fix spelling mistake: "caculate" -> "calculate"
x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes
x86: Remove pr_fmt duplicate logging prefixes
x86/early-quirks: Rename duplicate define of dev_err
x86/bpf: Clean up non-standard comments, to make the code more readable
Diffstat (limited to 'arch/x86/kernel/uprobes.c')
| -rw-r--r-- | arch/x86/kernel/uprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index c84bb5396958..58d8d800875d 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -1083,8 +1083,8 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs return orig_ret_vaddr; if (nleft != rasize) { - pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, " - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip); + pr_err("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n", + current->pid, regs->sp, regs->ip); force_sig_info(SIGSEGV, SEND_SIG_FORCED, current); } |