Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59df8399 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

s390: types: use <asm-generic/int-*.h> for the s390 architecture 



This modifies <asm-s390/types.h> to use the <asm-generic/int-*.h>
generic include files.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
parent 3f02c4e0

include/asm-s390/types.h

+6 −42
Original line number Diff line number Diff line
@@ -9,34 +9,16 @@ 
#ifndef _S390_TYPES_H

#define _S390_TYPES_H



#ifndef __s390x__

# include <asm-generic/int-l64.h>

#else

# include <asm-generic/int-ll64.h>

#endif



#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 

*/
@@ -58,24 +40,6 @@ typedef __signed__ long saddr_t; 


#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__