From ebff70c91f0e9f3b8ed3bc25898d30a1fdbcd843 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 6 Jun 2008 21:35:43 +0200
Subject: [PATCH] --- yaml --- r: 104162 b: refs/heads/master c:
 b444b9a5a1171ef07e1a87b01f7bb5bd0206d012 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-sparc/types.h   | 32 +++++++++++++++++++++++++++-
 trunk/include/asm-sparc64/types.h | 35 +------------------------------
 3 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 1581f7859e7b..5c77e19d042d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d1b0e3d2b71ded7c457c2c9f1ab8c2c957aafe
+refs/heads/master: b444b9a5a1171ef07e1a87b01f7bb5bd0206d012
diff --git a/trunk/include/asm-sparc/types.h b/trunk/include/asm-sparc/types.h
index 07734f942405..8c28fde5eaa2 100644
--- a/trunk/include/asm-sparc/types.h
+++ b/trunk/include/asm-sparc/types.h
@@ -1,6 +1,5 @@
 #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) */
diff --git a/trunk/include/asm-sparc64/types.h b/trunk/include/asm-sparc64/types.h
index b27ccc85202f..cfbfad5043eb 100644
--- a/trunk/include/asm-sparc64/types.h
+++ b/trunk/include/asm-sparc64/types.h
@@ -1,34 +1 @@
-#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>