Skip to content

L
linux-davinci
Commit 19127e2b authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files
Options

[PATCH] m68knommu: add printk level for oops dumps 

Specify printk level in m68knommu oops dump code.
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1b9552af
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
arch/m68knommu/kernel/process.c
View file @ 19127e2b
...@@ -290,7 +290,7 @@ void dump(struct pt_regs *fp) ...@@ -290,7 +290,7 @@ void dump(struct pt_regs *fp)
unsigned char *tp; unsigned char *tp;
int i; int i;
printk(KERN_EMERG "\nCURRENT PROCESS:\n\n"); printk(KERN_EMERG "\n" KERN_EMERG "CURRENT PROCESS:\n" KERN_EMERG "\n");
printk(KERN_EMERG "COMM=%s PID=%d\n", current->comm, current->pid); printk(KERN_EMERG "COMM=%s PID=%d\n", current->comm, current->pid);
if (current->mm) { if (current->mm) {
...@@ -301,7 +301,8 @@ void dump(struct pt_regs *fp) ...@@ -301,7 +301,8 @@ void dump(struct pt_regs *fp)
(int) current->mm->end_data, (int) current->mm->end_data,
(int) current->mm->end_data, (int) current->mm->end_data,
(int) current->mm->brk); (int) current->mm->brk);
printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n\n", printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n"
KERN_EMERG "\n",
(int) current->mm->start_stack, (int) current->mm->start_stack,
(int)(((unsigned long) current) + THREAD_SIZE)); (int)(((unsigned long) current) + THREAD_SIZE));
} }
...@@ -312,36 +313,35 @@ void dump(struct pt_regs *fp) ...@@ -312,36 +313,35 @@ void dump(struct pt_regs *fp)
fp->d0, fp->d1, fp->d2, fp->d3); fp->d0, fp->d1, fp->d2, fp->d3);
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1); fp->d4, fp->d5, fp->a0, fp->a1);
printk(KERN_EMERG "\nUSP: %08x TRAPFRAME: %08x\n", (unsigned int) rdusp(), printk(KERN_EMERG "\n" KERN_EMERG "USP: %08x TRAPFRAME: %08x\n",
(unsigned int) fp); (unsigned int) rdusp(), (unsigned int) fp);
printk(KERN_EMERG "\nCODE:"); printk(KERN_EMERG "\n" KERN_EMERG "CODE:");
tp = ((unsigned char *) fp->pc) - 0x20; tp = ((unsigned char *) fp->pc) - 0x20;
for (sp = (unsigned long *) tp, i = 0; (i < 0x40); i += 4) { for (sp = (unsigned long *) tp, i = 0; (i < 0x40); i += 4) {
if ((i % 0x10) == 0) if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i)); printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++); printk("%08x ", (int) *sp++);
} }
printk(KERN_EMERG "\n"); printk("\n" KERN_EMERG "\n");
printk(KERN_EMERG "\nKERNEL STACK:"); printk(KERN_EMERG "KERNEL STACK:");
tp = ((unsigned char *) fp) - 0x40; tp = ((unsigned char *) fp) - 0x40;
for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) { for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) {
if ((i % 0x10) == 0) if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i)); printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++); printk("%08x ", (int) *sp++);
} }
printk(KERN_EMERG "\n"); printk("\n" KERN_EMERG "\n");
printk(KERN_EMERG "\n");
printk(KERN_EMERG "\nUSER STACK:"); printk(KERN_EMERG "USER STACK:");
tp = (unsigned char *) (rdusp() - 0x10); tp = (unsigned char *) (rdusp() - 0x10);
for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) { for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) {
if ((i % 0x10) == 0) if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i)); printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++); printk("%08x ", (int) *sp++);
} }
printk(KERN_EMERG "\n\n"); printk("\n" KERN_EMERG "\n");
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment