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

Commit b444b9a5 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: Merge asm-sparc{,64}/types.h 



Copy content of sparc64 file to sparc file.
There is only minimal possibilities for further unification.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent c6d1b0e3

include/asm-sparc/types.h

+31 −1
Original line number Diff line number Diff line 
#ifndef _SPARC_TYPES_H

#define _SPARC_TYPES_H



/*

 * This file is never included by application software unless

 * explicitly requested (e.g., via linux/types.h) in which case the
@@ -8,6 +7,35 @@ 
 * not a major issue.  However, for interoperability, libraries still

 * need to be careful to avoid a name clashes.

 */



#if defined(__sparc__) && defined(__arch64__)



/*** SPARC 64 bit ***/

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



#ifndef __ASSEMBLY__



typedef unsigned short umode_t;



#endif /* __ASSEMBLY__ */



#ifdef __KERNEL__



#define BITS_PER_LONG 64



#ifndef __ASSEMBLY__



/* Dma addresses come in generic and 64-bit flavours.  */



typedef u32 dma_addr_t;

typedef u64 dma64_addr_t;



#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */

#else



/*** SPARC 32 bit ***/

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



#ifndef __ASSEMBLY__
@@ -29,4 +57,6 @@ typedef u32 dma64_addr_t; 


#endif /* __KERNEL__ */



#endif /* defined(__sparc__) && defined(__arch64__) */



#endif /* defined(_SPARC_TYPES_H) */

include/asm-sparc64/types.h

+1 −34
Original line number Diff line number Diff line 
#ifndef _SPARC64_TYPES_H

#define _SPARC64_TYPES_H



/*

 * This file is never included by application software unless

 * explicitly requested (e.g., via linux/types.h) in which case the

 * application is Linux specific so (user-) name space pollution is

 * not a major issue.  However, for interoperability, libraries still

 * need to be careful to avoid a name clashes.

 */

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



#ifndef __ASSEMBLY__



typedef unsigned short umode_t;



#endif /* __ASSEMBLY__ */



#ifdef __KERNEL__



#define BITS_PER_LONG 64



#ifndef __ASSEMBLY__



/* Dma addresses come in generic and 64-bit flavours.  */



typedef u32 dma_addr_t;

typedef u64 dma64_addr_t;



#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */



#endif /* defined(_SPARC64_TYPES_H) */
 
#include <asm-sparc/types.h>