asm-generic: introduce asm/bitsperlong.h

[sfrench/cifs-2.6.git] / arch / s390 / include / asm / types.h

diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 41c547656130e75bb206312f3175d23bd2e868a7..04d6b95a89c6b4ce1c5454341d378ea45700e286 100644 (file)
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -9,11 +9,7 @@
 #ifndef _S390_TYPES_H
 #define _S390_TYPES_H
 
-#ifndef __s390x__
-# include <asm-generic/int-ll64.h>
-#else
-# include <asm-generic/int-l64.h>
-#endif
+#include <asm-generic/int-ll64.h>
 
 #ifndef __ASSEMBLY__
 
@@ -32,12 +28,6 @@ typedef __signed__ long saddr_t;
  */
 #ifdef __KERNEL__
 
-#ifndef __s390x__
-#define BITS_PER_LONG 32
-#else
-#define BITS_PER_LONG 64
-#endif
-
 #ifndef __ASSEMBLY__
 
 typedef u64 dma64_addr_t;