]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
types: s390: fix #ifdef reversal in <asm-s390/types.h>
authorH. Peter Anvin <hpa@zytor.com>
Fri, 9 May 2008 16:46:38 +0000 (09:46 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 12 May 2008 15:49:59 +0000 (08:49 -0700)
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>
include/asm-s390/types.h

index 78dda038dd47c3b60e153e78dab2e67ac5f16dda..0e959e20e9a310fa84812b824c5a64fb3229bf1d 100644 (file)
@@ -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__