diff options
Diffstat (limited to 'arch/parisc/kernel/traps.c')
-rw-r--r-- | arch/parisc/kernel/traps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index bbf029a184ac..99fd56939afa 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
@@ -219,7 +219,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) | |||
219 | return; /* STFU */ | 219 | return; /* STFU */ |
220 | 220 | ||
221 | printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", | 221 | printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", |
222 | current->comm, current->pid, str, err, regs->iaoq[0]); | 222 | current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); |
223 | #ifdef PRINT_USER_FAULTS | 223 | #ifdef PRINT_USER_FAULTS |
224 | /* XXX for debugging only */ | 224 | /* XXX for debugging only */ |
225 | show_regs(regs); | 225 | show_regs(regs); |
@@ -252,7 +252,7 @@ KERN_CRIT " || ||\n"); | |||
252 | 252 | ||
253 | if (err) | 253 | if (err) |
254 | printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", | 254 | printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n", |
255 | current->comm, current->pid, str, err); | 255 | current->comm, task_pid_nr(current), str, err); |
256 | 256 | ||
257 | /* Wot's wrong wif bein' racy? */ | 257 | /* Wot's wrong wif bein' racy? */ |
258 | if (current->thread.flags & PARISC_KERNEL_DEATH) { | 258 | if (current->thread.flags & PARISC_KERNEL_DEATH) { |
@@ -317,7 +317,7 @@ static void handle_break(struct pt_regs *regs) | |||
317 | if (unlikely(iir != GDB_BREAK_INSN)) { | 317 | if (unlikely(iir != GDB_BREAK_INSN)) { |
318 | printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n", | 318 | printk(KERN_DEBUG "break %d,%d: pid=%d command='%s'\n", |
319 | iir & 31, (iir>>13) & ((1<<13)-1), | 319 | iir & 31, (iir>>13) & ((1<<13)-1), |
320 | current->pid, current->comm); | 320 | task_pid_nr(current), current->comm); |
321 | show_regs(regs); | 321 | show_regs(regs); |
322 | } | 322 | } |
323 | #endif | 323 | #endif |
@@ -747,7 +747,7 @@ void handle_interruption(int code, struct pt_regs *regs) | |||
747 | if (user_mode(regs)) { | 747 | if (user_mode(regs)) { |
748 | #ifdef PRINT_USER_FAULTS | 748 | #ifdef PRINT_USER_FAULTS |
749 | printk(KERN_DEBUG "\nhandle_interruption() pid=%d command='%s'\n", | 749 | printk(KERN_DEBUG "\nhandle_interruption() pid=%d command='%s'\n", |
750 | current->pid, current->comm); | 750 | task_pid_nr(current), current->comm); |
751 | show_regs(regs); | 751 | show_regs(regs); |
752 | #endif | 752 | #endif |
753 | /* SIGBUS, for lack of a better one. */ | 753 | /* SIGBUS, for lack of a better one. */ |
@@ -772,7 +772,7 @@ void handle_interruption(int code, struct pt_regs *regs) | |||
772 | else | 772 | else |
773 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", | 773 | printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ", |
774 | code); | 774 | code); |
775 | printk("pid=%d command='%s'\n", current->pid, current->comm); | 775 | printk("pid=%d command='%s'\n", task_pid_nr(current), current->comm); |
776 | show_regs(regs); | 776 | show_regs(regs); |
777 | #endif | 777 | #endif |
778 | si.si_signo = SIGSEGV; | 778 | si.si_signo = SIGSEGV; |