Skip to contentSkip to conversation

SPARC: fix duplicate declaration

RFC PATCH In review Jaswinder Singh Rajput 2 participants 2 messages Aug 13, 2009 – Aug 17, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

Jaswinder Singh Rajput

author
#0 lore raw

RFC PATCH 1/1 SPARC: fix duplicate declaration

Only difference for 32 and 64 bit version is dma64_addr_t and rest is same.

Also fixed the following 'make includecheck' warning:

arch/sparc/include/asm/types.h: asm-generic/int-ll64.h is included more than once.

Signed-off-by Jaswinder Singh Rajput <[email protected]>
---
 arch/sparc/include/asm/types.h |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)
arch/sparc/include/asm/types.h +7 -20
index de671d7..09c79a9 100644
@@ -8,9 +8,8 @@
  * need to be careful to avoid a name clashes.
  */
 
-#if defined(__sparc__) && defined(__arch64__)
+#if defined(__sparc__)
 
-/*** SPARC 64 bit ***/
 #include <asm-generic/int-ll64.h>
 
 #ifndef __ASSEMBLY__

@@ -26,33 +25,21 @@ typedef unsigned short umode_t;
 /* Dma addresses come in generic and 64-bit flavours.  */
 
 typedef u32 dma_addr_t;
-typedef u64 dma64_addr_t;
 
-#endif /* __ASSEMBLY__ */
+#if defined(__arch64__)
 
-#endif /* __KERNEL__ */
+/*** SPARC 64 bit ***/
+typedef u64 dma64_addr_t;
 #else
-
 /*** SPARC 32 bit ***/
-#include <asm-generic/int-ll64.h>
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
+#endif /* defined(__arch64__) */
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
 
-#endif /* defined(__sparc__) && defined(__arch64__) */
+#endif /* defined(__sparc__) */
 
 #endif /* defined(_SPARC_TYPES_H) */
Signature · 1 line
1.6.0.6
maintainer
#1 lore raw

From: Jaswinder Singh Rajput <[email protected]>
Date: Thu, 13 Aug 2009 14:19:47 +0530

Quoted 7 lines

Only difference for 32 and 64 bit version is dma64_addr_t and rest is same.

Also fixed the following 'make includecheck' warning:

arch/sparc/include/asm/types.h: asm-generic/int-ll64.h is included more than once.

Signed-off-by Jaswinder Singh Rajput <[email protected]>

I'll apply this, thanks.