mirror of https://gitee.com/openkylin/linux.git
kernel/signal.c: fix suboptimal printk usage
Several printk's were missing KERN_INFO and KERN_CONT flags. In addition, a printk that was outside a #if/#endif should have been inside, which would result in stray blank line on non-x86 boxes. Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
66dd34ad31
commit
5d1fadc147
|
@ -1157,11 +1157,11 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
|
|||
static void print_fatal_signal(int signr)
|
||||
{
|
||||
struct pt_regs *regs = signal_pt_regs();
|
||||
printk("%s/%d: potentially unexpected fatal signal %d.\n",
|
||||
printk(KERN_INFO "%s/%d: potentially unexpected fatal signal %d.\n",
|
||||
current->comm, task_pid_nr(current), signr);
|
||||
|
||||
#if defined(__i386__) && !defined(__arch_um__)
|
||||
printk("code at %08lx: ", regs->ip);
|
||||
printk(KERN_INFO "code at %08lx: ", regs->ip);
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < 16; i++) {
|
||||
|
@ -1169,11 +1169,11 @@ static void print_fatal_signal(int signr)
|
|||
|
||||
if (get_user(insn, (unsigned char *)(regs->ip + i)))
|
||||
break;
|
||||
printk("%02x ", insn);
|
||||
printk(KERN_CONT "%02x ", insn);
|
||||
}
|
||||
}
|
||||
printk(KERN_CONT "\n");
|
||||
#endif
|
||||
printk("\n");
|
||||
preempt_disable();
|
||||
show_regs(regs);
|
||||
preempt_enable();
|
||||
|
|
Loading…
Reference in New Issue