diff options
authorH. Peter Anvin <>2008-04-06 10:35:13 -0700
committerH. Peter Anvin <>2008-05-02 16:18:41 -0700
commit0dc794754cba8e3e8eb39bc028cb88c5d6ed506b (patch)
parenta3727dc6c21cd0bed64dbc97212c39d2b391f5af (diff)
sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
This modifies <asm-sparc64/types.h> to use the <asm-generic/int-*.h> generic include files. Signed-off-by: H. Peter Anvin <> Acked-by: David S. Miller <>
1 files changed, 1 insertions, 29 deletions
diff --git a/include/asm-sparc64/types.h b/include/asm-sparc64/types.h
index d0ee7f105838..5dbe04f4044a 100644
--- a/include/asm-sparc64/types.h
+++ b/include/asm-sparc64/types.h
@@ -9,28 +9,12 @@
* 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;
- * _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;
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
#endif /* __ASSEMBLY__ */
#ifdef __KERNEL__
@@ -39,18 +23,6 @@ typedef unsigned 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 s64;
-typedef unsigned long u64;
/* Dma addresses come in generic and 64-bit flavours. */
typedef u32 dma_addr_t;