From b99e09b810476547e059ae69ed8a2b3ee31b39d7 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 6 Apr 2008 10:35:06 -0700
Subject: [PATCH] --- yaml --- r: 95931 b: refs/heads/master c:
 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9 h: refs/heads/master i:   95929:
 d9a987526a65e4616197900fd44d74d27c384c4e   95927:
 ca0a9b904b6eeacd2fe7f2cfe9d99362fae57813 v: v3

---
 [refs]                         |  2 +-
 trunk/include/asm-mips/types.h | 56 ++++------------------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/[refs] b/[refs]
index 1bf641519981..672f5b847ed7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad55ed6161c113cc03c04df266e75d484bce8247
+refs/heads/master: 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
diff --git a/trunk/include/asm-mips/types.h b/trunk/include/asm-mips/types.h
index 2dd147f519d1..7a2ee4f40131 100644
--- a/trunk/include/asm-mips/types.h
+++ b/trunk/include/asm-mips/types.h
@@ -9,36 +9,16 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
 
+#if _MIPS_SZLONG == 64
+# 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;
-
-#if (_MIPS_SZLONG == 64)
-
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
-#else
-
-#if defined(__GNUC__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#endif
-
 #endif
 
 #endif /* __ASSEMBLY__ */
@@ -52,30 +32,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;
-
-#if (_MIPS_SZLONG == 64)
-
-typedef __signed__ long s64;
-typedef unsigned long u64;
-
-#else
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long s64;
-typedef unsigned long long u64;
-#endif
-
-#endif
-
 #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
     || defined(CONFIG_64BIT)
 typedef u64 dma_addr_t;