Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359288
b: refs/heads/master
c: 5d1fadc
h: refs/heads/master
v: v3
  • Loading branch information
Valdis Kletnieks authored and Linus Torvalds committed Feb 28, 2013
1 parent 7c5319e commit 514924c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66dd34ad31e5963d72a700ec3f2449291d322921
refs/heads/master: 5d1fadc1472396d602f0eeb10d37519e2a14e8bc
8 changes: 4 additions & 4 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1157,23 +1157,23 @@ 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++) {
unsigned char insn;

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();
Expand Down

0 comments on commit 514924c

Please sign in to comment.