Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ca5cd877ae699e758e6f26efc11b01bf6631d427
Commit: ca5cd877ae699e758e6f26efc11b01bf6631d427
Parent: 2a397e82c7db18019e408f953dd58dc1963a328c
Author: Al Viro [EMAIL PROTECTED]
AuthorDate: Mon Oct 29 04:31:16 2007 +
Committer: Linus Torvalds [EMAIL PROTECTED]
CommitDate: Mon Oct 29 07:41:32 2007 -0700
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 [EMAIL PROTECTED]
Signed-off-by: Linus Torvalds [EMAIL PROTECTED]
---
arch/um/Makefile-i386 |3 +--
arch/um/Makefile-x86_64 |5 +
drivers/char/mem.c|4 ++--
drivers/md/raid6algos.c |4 ++--
drivers/md/raid6mmx.c |2 +-
drivers/md/raid6sse1.c|2 +-
drivers/md/raid6sse2.c|4 ++--
drivers/md/raid6x86.h |2 +-
include/asm-um/unistd.h |1 -
include/linux/eventpoll.h |7 +--
kernel/signal.c |2 +-
11 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 0178df3..08433f8 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -9,6 +9,7 @@ ELF_ARCH:= $(SUBARCH)
ELF_FORMAT := elf32-$(SUBARCH)
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
HEADER_ARCH:= x86
+CHECKFLAGS += -D__i386__
ifeq ($(origin SUBARCH), command line)
ifneq ($(shell uname -m | sed -e s/i.86/i386/), $(SUBARCH))
@@ -26,8 +27,6 @@ AFLAGS+= -DCONFIG_X86_32
CONFIG_X86_32 := y
export CONFIG_X86_32
-ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH)
-
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
include $(srctree)/arch/i386/Makefile.cpu
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index fe5316f..8ed362f 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -6,12 +6,9 @@ START := 0x6000
_extra_flags_ = -fno-builtin -m64
-#We #undef __x86_64__ for kernelspace, not for userspace where
-#it's needed for headers to work!
-ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__
KBUILD_CFLAGS += $(_extra_flags_)
-CHECKFLAGS += -m64
+CHECKFLAGS += -m64 -D__x86_64__
KBUILD_AFLAGS += -m64
LDFLAGS += -m elf_x86_64
KBUILD_CPPFLAGS += -m64
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 0e937f6..20070b7 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -41,7 +41,7 @@
*/
static inline int uncached_access(struct file *file, unsigned long addr)
{
-#if defined(__i386__)
+#if defined(__i386__) !defined(__arch_um__)
/*
* On the PPro and successors, the MTRRs are used to set
* memory types for physical addresses outside main memory,
@@ -57,7 +57,7 @@ static inline int uncached_access(struct file *file, unsigned
long addr)
test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability)
||
test_bit(X86_FEATURE_CENTAUR_MCR,
boot_cpu_data.x86_capability) )
addr = __pa(high_memory);
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) !defined(__arch_um__)
/*
* This is broken because it can generate memory type aliases,
* which can cause cache corruptions
diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c
index 9265761..77a6e4b 100644
--- a/drivers/md/raid6algos.c
+++ b/drivers/md/raid6algos.c
@@ -52,7 +52,7 @@ const struct raid6_calls * const raid6_algos[] = {
raid6_intx16,
raid6_intx32,
#endif
-#if defined(__i386__)
+#if defined(__i386__) !defined(__arch_um__)
raid6_mmxx1,
raid6_mmxx2,
raid6_sse1x1,
@@ -60,7 +60,7 @@ const struct raid6_calls * const raid6_algos[] = {
raid6_sse2x1,
raid6_sse2x2,
#endif
-#if defined(__x86_64__)
+#if defined(__x86_64__) !defined(__arch_um__)
raid6_sse2x1,
raid6_sse2x2,
raid6_sse2x4,
diff --git a/drivers/md/raid6mmx.c b/drivers/md/raid6mmx.c
index 6181a5a..d4e4a1b 100644
--- a/drivers/md/raid6mmx.c
+++ b/drivers/md/raid6mmx.c
@@ -16,7 +16,7 @@
* MMX implementation of RAID-6 syndrome functions
*/
-#if defined(__i386__)
+#if defined(__i386__) !defined(__arch_um__)
#include raid6.h
#include raid6x86.h
diff --git a/drivers/md/raid6sse1.c b/drivers/md/raid6sse1.c
index f0a1ba8..0666237 100644
--- a/drivers/md/raid6sse1.c
+++ b/drivers/md/raid6sse1.c
@@ -21,7 +21,7 @@
* worthwhile as a separate implementation.
*/
-#if defined(__i386__)
+#if defined(__i386__) !defined(__arch_um__)
#include raid6.h
#include raid6x86.h
diff --git a/drivers/md/raid6sse2.c b/drivers/md/raid6sse2.c
index 0f01976..b034ad8 100644
--- a/drivers/md/raid6sse2.c
+++ b/drivers/md/raid6sse2.c
@@ -17,7 +17,7 @@
*
*/
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined
