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

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

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



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

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
parent 5424a328

include/asm-cris/types.h

+2 −31
Original line number Diff line number Diff line 
#ifndef _ETRAX_TYPES_H

#define _ETRAX_TYPES_H



#include <asm-generic/int-ll64.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;



#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*
@@ -35,18 +18,6 @@ __extension__ typedef unsigned long long __u64; 


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



typedef signed long long s64;

typedef unsigned long long u64;



/* Dma addresses are 32-bits wide, just like our other addresses.  */

 

typedef u32 dma_addr_t;