summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-05-09 18:46:38 +0200
committerH. Peter Anvin <hpa@zytor.com>2008-05-12 17:49:59 +0200
commit2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029 (patch)
tree5472bdef2a5861733776d28d1107d88f2e7bb26c
parentLinux 2.6.26-rc2 (diff)
downloadlinux-2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029.tar.xz
linux-2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029.zip
types: s390: fix #ifdef reversal in <asm-s390/types.h>
The #ifdef for the integer types was reversed; the standard pattern in these files are: #ifndef __s390x__ /* 32-bit code */ #else /* 64-bit code */ #endif Stick with the original pattern, but make sure the 32-bit code actually comes first! Reported by Al Viro. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/asm-s390/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 78dda038dd47..0e959e20e9a3 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -10,9 +10,9 @@
#define _S390_TYPES_H
#ifndef __s390x__
-# include <asm-generic/int-l64.h>
-#else
# include <asm-generic/int-ll64.h>
+#else
+# include <asm-generic/int-l64.h>
#endif
#ifndef __ASSEMBLY__