aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorValdis Kletnieks <Valdis.Kletnieks@vt.edu>2013-02-27 20:03:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 22:10:11 -0500
commit5d1fadc1472396d602f0eeb10d37519e2a14e8bc (patch)
treed5427e3a02ca6221683f7bc21a0e2f0f34787fe9 /kernel/signal.c
parent66dd34ad31e5963d72a700ec3f2449291d322921 (diff)
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>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index c6209135cca4..2676aac4103d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1157,11 +1157,11 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
1157static void print_fatal_signal(int signr) 1157static void print_fatal_signal(int signr)
1158{ 1158{
1159 struct pt_regs *regs = signal_pt_regs(); 1159 struct pt_regs *regs = signal_pt_regs();
1160 printk("%s/%d: potentially unexpected fatal signal %d.\n", 1160 printk(KERN_INFO "%s/%d: potentially unexpected fatal signal %d.\n",
1161 current->comm, task_pid_nr(current), signr); 1161 current->comm, task_pid_nr(current), signr);
1162 1162
1163#if defined(__i386__) && !defined(__arch_um__) 1163#if defined(__i386__) && !defined(__arch_um__)
1164 printk("code at %08lx: ", regs->ip); 1164 printk(KERN_INFO "code at %08lx: ", regs->ip);
1165 { 1165 {
1166 int i; 1166 int i;
1167 for (i = 0; i < 16; i++) { 1167 for (i = 0; i < 16; i++) {
@@ -1169,11 +1169,11 @@ static void print_fatal_signal(int signr)
1169 1169
1170 if (get_user(insn, (unsigned char *)(regs->ip + i))) 1170 if (get_user(insn, (unsigned char *)(regs->ip + i)))
1171 break; 1171 break;
1172 printk("%02x ", insn); 1172 printk(KERN_CONT "%02x ", insn);
1173 } 1173 }
1174 } 1174 }
1175 printk(KERN_CONT "\n");
1175#endif 1176#endif
1176 printk("\n");
1177 preempt_disable(); 1177 preempt_disable();
1178 show_regs(regs); 1178 show_regs(regs);
1179 preempt_enable(); 1179 preempt_enable();