git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86 merge fallout: uml
[safe/jmp/linux-2.6]
/
kernel
/
signal.c
diff --git
a/kernel/signal.c
b/kernel/signal.c
index
1200630
..
4537bdd
100644
(file)
--- a/
kernel/signal.c
+++ b/
kernel/signal.c
@@
-732,7
+732,7
@@
static void print_fatal_signal(struct pt_regs *regs, int signr)
printk("%s/%d: potentially unexpected fatal signal %d.\n",
current->comm, task_pid_nr(current), signr);
-#if
def __i386__
+#if
defined(__i386__) && !defined(__arch_um__)
printk("code at %08lx: ", regs->eip);
{
int i;