Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 189c8f3a369ce612ecfeb6b7af352fb75350fcf7..98db30481d97eb211d1e767ca9701767e323dc09 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -19,6 +19,7 @@ CFLAGS                += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
 STACK_SIZE     := 8192
+CHECKFLAGS     += -D__s390__
 endif
 
 ifdef CONFIG_ARCH_S390X
@@ -28,6 +29,7 @@ CFLAGS                += -m64
 AFLAGS         += -m64
 UTS_MACHINE    := s390x
 STACK_SIZE     := 16384
+CHECKFLAGS     += -D__s390__ -D__s390x__
 endif
 
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)