git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
traps.c
diff --git
a/arch/m68knommu/kernel/traps.c
b/arch/m68knommu/kernel/traps.c
index
51d3253
..
3739c8f
100644
(file)
--- a/
arch/m68knommu/kernel/traps.c
+++ b/
arch/m68knommu/kernel/traps.c
@@
-111,7
+111,7
@@
static void print_this_address(unsigned long addr, int i)
if (i % 5)
printk(KERN_CONT " [%08lx] ", addr);
else
if (i % 5)
printk(KERN_CONT " [%08lx] ", addr);
else
- printk(KERN_
CONT "\n" KERN_
EMERG " [%08lx] ", addr);
+ printk(KERN_EMERG " [%08lx] ", addr);
i++;
#endif
}
i++;
#endif
}
@@
-137,8
+137,8
@@
static void __show_stack(struct task_struct *task, unsigned long *stack)
if (stack + 1 + i > endstack)
break;
if (i % 8 == 0)
if (stack + 1 + i > endstack)
break;
if (i % 8 == 0)
- printk(
"\n"
KERN_EMERG " ");
- printk(" %08lx", *(stack + i));
+ printk(KERN_EMERG " ");
+ printk(
KERN_CONT
" %08lx", *(stack + i));
}
printk("\n");
i = 0;
}
printk("\n");
i = 0;