summaryrefslogtreecommitdiff
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-06-06 21:35:43 +0200
committerDavid S. Miller <davem@davemloft.net>2008-07-17 21:42:19 -0700
commitb444b9a5a1171ef07e1a87b01f7bb5bd0206d012 (patch)
tree1fc1082a05e20680adece9d4f0c45a4f8f7df82f /include/asm-sparc
parentc6d1b0e3d2b71ded7c457c2c9f1ab8c2c957aafe (diff)
downloadlinux-3.10-b444b9a5a1171ef07e1a87b01f7bb5bd0206d012.tar.gz
linux-3.10-b444b9a5a1171ef07e1a87b01f7bb5bd0206d012.tar.bz2
linux-3.10-b444b9a5a1171ef07e1a87b01f7bb5bd0206d012.zip
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: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/types.h32
1 files changed, 31 insertions, 1 deletions
diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 07734f94240..8c28fde5eaa 100644
--- a/include/asm-sparc/types.h
+++ b/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) */