summaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-29 04:31:16 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-29 07:41:32 -0700
commitca5cd877ae699e758e6f26efc11b01bf6631d427 (patch)
treef2337ce76ab006d9705b10e8e0ed2f62487c837f /kernel/signal.c
parent2a397e82c7db18019e408f953dd58dc1963a328c (diff)
downloadop-kernel-dev-ca5cd877ae699e758e6f26efc11b01bf6631d427.zip
op-kernel-dev-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.gz
x86 merge fallout: uml
Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places that required adjusting the ifdefs got those. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 1200630..4537bdd 100644
--- 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);
-#ifdef __i386__
+#if defined(__i386__) && !defined(__arch_um__)
printk("code at %08lx: ", regs->eip);
{
int i;
OpenPOWER on IntegriCloud