a439fe51a1
The majority of this patch was created by the following script: *** ASM=arch/sparc/include/asm mkdir -p $ASM git mv include/asm-sparc64/ftrace.h $ASM git rm include/asm-sparc64/* git mv include/asm-sparc/* $ASM sed -ie 's/asm-sparc64/asm/g' $ASM/* sed -ie 's/asm-sparc/asm/g' $ASM/* *** The rest was an update of the top-level Makefile to use sparc for header files when sparc64 is being build. And a small fixlet to pick up the correct unistd.h from sparc64 code. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
63 lines
1.2 KiB
C
63 lines
1.2 KiB
C
#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
|
|
* 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.
|
|
*/
|
|
|
|
#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__
|
|
|
|
typedef unsigned short umode_t;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#define BITS_PER_LONG 32
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
typedef u32 dma_addr_t;
|
|
typedef u32 dma64_addr_t;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* defined(__sparc__) && defined(__arch64__) */
|
|
|
|
#endif /* defined(_SPARC_TYPES_H) */
|