68a9bd0cd5
Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit targets. GCC can be made to warn about usage of long long types with ISO C90 (-ansi), but only with -pedantic. You can write this in a way that even then it doesn't cause warnings, namely by: #ifdef __GNUC__ __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; #endif The __extension__ keyword in front of this switches off any pedantic warnings for this expression. Signed-off-by: Olaf Hering <olh@suse.de> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
93 lines
1.7 KiB
C
93 lines
1.7 KiB
C
/*
|
|
* include/asm-s390/types.h
|
|
*
|
|
* S390 version
|
|
*
|
|
* Derived from "include/asm-i386/types.h"
|
|
*/
|
|
|
|
#ifndef _S390_TYPES_H
|
|
#define _S390_TYPES_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
typedef unsigned short umode_t;
|
|
|
|
/*
|
|
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
|
|
* header files exported to user space
|
|
*/
|
|
|
|
typedef __signed__ char __s8;
|
|
typedef unsigned char __u8;
|
|
|
|
typedef __signed__ short __s16;
|
|
typedef unsigned short __u16;
|
|
|
|
typedef __signed__ int __s32;
|
|
typedef unsigned int __u32;
|
|
|
|
#ifndef __s390x__
|
|
#if defined(__GNUC__)
|
|
__extension__ typedef __signed__ long long __s64;
|
|
__extension__ typedef unsigned long long __u64;
|
|
#endif
|
|
#else /* __s390x__ */
|
|
typedef __signed__ long __s64;
|
|
typedef unsigned long __u64;
|
|
#endif
|
|
|
|
/* A address type so that arithmetic can be done on it & it can be upgraded to
|
|
64 bit when necessary
|
|
*/
|
|
typedef unsigned long addr_t;
|
|
typedef __signed__ long saddr_t;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
/*
|
|
* These aren't exported outside the kernel to avoid name space clashes
|
|
*/
|
|
#ifdef __KERNEL__
|
|
|
|
#ifndef __s390x__
|
|
#define BITS_PER_LONG 32
|
|
#else
|
|
#define BITS_PER_LONG 64
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
|
|
typedef signed char s8;
|
|
typedef unsigned char u8;
|
|
|
|
typedef signed short s16;
|
|
typedef unsigned short u16;
|
|
|
|
typedef signed int s32;
|
|
typedef unsigned int u32;
|
|
|
|
#ifndef __s390x__
|
|
typedef signed long long s64;
|
|
typedef unsigned long long u64;
|
|
#else /* __s390x__ */
|
|
typedef signed long s64;
|
|
typedef unsigned long u64;
|
|
#endif /* __s390x__ */
|
|
|
|
typedef u32 dma_addr_t;
|
|
|
|
#ifndef __s390x__
|
|
typedef union {
|
|
unsigned long long pair;
|
|
struct {
|
|
unsigned long even;
|
|
unsigned long odd;
|
|
} subreg;
|
|
} register_pair;
|
|
|
|
#endif /* ! __s390x__ */
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _S390_TYPES_H */
|