aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/types.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-05-23 16:24:51 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-05-24 10:10:10 +0200
commitf4815ac6c935b8e441fe12504d62e0e8ff7f7ce5 (patch)
tree32b78252b6b155e7a218c571d9e994c78da1aee0 /arch/s390/include/asm/types.h
parentda477737c5ec99d37cb78dab909aa0402a0ebf18 (diff)
s390/headers: replace __s390x__ with CONFIG_64BIT where possible
Replace __s390x__ with CONFIG_64BIT in all places that are not exported to userspace or guarded with #ifdef __KERNEL__. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/types.h')
-rw-r--r--arch/s390/include/asm/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 05ebbcdbbf6..6c8c35f8df1 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -28,7 +28,7 @@ typedef __signed__ long saddr_t;
#ifndef __ASSEMBLY__
-#ifndef __s390x__
+#ifndef CONFIG_64BIT
typedef union {
unsigned long long pair;
struct {
@@ -37,7 +37,7 @@ typedef union {
} subreg;
} register_pair;
-#endif /* ! __s390x__ */
+#endif /* ! CONFIG_64BIT */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _S390_TYPES_H */