x86 merge fallout: uml
authorAl Viro <viro@ftp.linux.org.uk>
Mon, 29 Oct 2007 04:31:16 +0000 (04:31 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 14:41:32 +0000 (07:41 -0700)
commitca5cd877ae699e758e6f26efc11b01bf6631d427
treef2337ce76ab006d9705b10e8e0ed2f62487c837f
parent2a397e82c7db18019e408f953dd58dc1963a328c
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>
arch/um/Makefile-i386
arch/um/Makefile-x86_64
drivers/char/mem.c
drivers/md/raid6algos.c
drivers/md/raid6mmx.c
drivers/md/raid6sse1.c
drivers/md/raid6sse2.c
drivers/md/raid6x86.h
include/asm-um/unistd.h
include/linux/eventpoll.h
kernel/signal.c