projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6dc6da0
)
x86_64/vsyscall: Fix warn_bad_vsyscall log output
author
Andy Lutomirski
<luto@amacapital.net>
Fri, 25 Jul 2014 23:30:27 +0000
(16:30 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 5 Sep 2014 23:28:36 +0000
(16:28 -0700)
commit
53b884ac3745353de220d92ef792515c3ae692f0
upstream.
This commit in Linux 3.6:
commit
c767a54ba0657e52e6edaa97cbe0b0a8bf1c1655
Author: Joe Perches <joe@perches.com>
Date: Mon May 21 19:50:07 2012 -0700
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
caused warn_bad_vsyscall to output garbage in the middle of the
line. Revert the bad part of it.
The printk in question isn't actually bare; the level is "%s".
The bug this fixes is purely cosmetic; backports are optional.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link:
http://lkml.kernel.org/r/03eac1f24110bbe496ecc12a4df467e0d88466d4.1406330947.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/vsyscall_64.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/vsyscall_64.c
b/arch/x86/kernel/vsyscall_64.c
index 9a907a67be8f48abc0399017865a4697968ae2c3..c52c07efe970ac8ed6d6b3fd014dbea2304415ed 100644
(file)
--- a/
arch/x86/kernel/vsyscall_64.c
+++ b/
arch/x86/kernel/vsyscall_64.c
@@
-125,10
+125,10
@@
static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,
if (!show_unhandled_signals)
return;
- pr
_notice
_ratelimited("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n",
-
level, current->comm, task_pid_nr(current),
-
message, regs->ip, regs->cs,
-
regs->sp, regs->ax, regs->si, regs->di);
+ pr
intk
_ratelimited("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n",
+ level, current->comm, task_pid_nr(current),
+ message, regs->ip, regs->cs,
+ regs->sp, regs->ax, regs->si, regs->di);
}
static int addr_to_vsyscall_nr(unsigned long addr)