git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
traps.c
diff --git
a/arch/sparc/kernel/traps.c
b/arch/sparc/kernel/traps.c
index
41d45c2
..
e246a33
100644
(file)
--- a/
arch/sparc/kernel/traps.c
+++ b/
arch/sparc/kernel/traps.c
@@
-9,7
+9,6
@@
* I hate traps on the sparc, grrr...
*/
* I hate traps on the sparc, grrr...
*/
-#include <linux/config.h>
#include <linux/sched.h> /* for jiffies */
#include <linux/kernel.h>
#include <linux/kallsyms.h>
#include <linux/sched.h> /* for jiffies */
#include <linux/kernel.h>
#include <linux/kallsyms.h>
@@
-100,7
+99,8
@@
void die_if_kernel(char *str, struct pt_regs *regs)
" /_| \\__/ |_\\\n"
" \\__U_/\n");
" /_| \\__/ |_\\\n"
" \\__U_/\n");
- printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
+ printk("%s(%d[#%u]): %s [#%d]\n", current->comm,
+ current->pid, current->xid, str, ++die_counter);
show_regs(regs);
__SAVE; __SAVE; __SAVE; __SAVE;
show_regs(regs);
__SAVE; __SAVE; __SAVE; __SAVE;