tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 <jaswinderrajput@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Jaswinder Singh Rajput
and committed by
David S. Miller
3f389635
48e46b7b
+8
-21
+8
-21
arch/sparc/include/asm/types.h
+8
-21
arch/sparc/include/asm/types.h
···
8
8
* need to be careful to avoid a name clashes.
9
9
*/
10
10
11
-
#if defined(__sparc__) && defined(__arch64__)
11
+
#if defined(__sparc__)
12
12
13
-
/*** SPARC 64 bit ***/
14
13
#include <asm-generic/int-ll64.h>
15
14
16
15
#ifndef __ASSEMBLY__
···
25
26
/* Dma addresses come in generic and 64-bit flavours. */
26
27
27
28
typedef u32 dma_addr_t;
29
+
30
+
#if defined(__arch64__)
31
+
32
+
/*** SPARC 64 bit ***/
28
33
typedef u64 dma64_addr_t;
29
-
30
-
#endif /* __ASSEMBLY__ */
31
-
32
-
#endif /* __KERNEL__ */
33
34
#else
34
-
35
35
/*** SPARC 32 bit ***/
36
-
#include <asm-generic/int-ll64.h>
37
-
38
-
#ifndef __ASSEMBLY__
39
-
40
-
typedef unsigned short umode_t;
41
-
42
-
#endif /* __ASSEMBLY__ */
43
-
44
-
#ifdef __KERNEL__
45
-
46
-
#ifndef __ASSEMBLY__
47
-
48
-
typedef u32 dma_addr_t;
49
36
typedef u32 dma64_addr_t;
50
37
38
+
#endif /* defined(__arch64__) */
39
+
51
40
#endif /* __ASSEMBLY__ */
52
41
53
42
#endif /* __KERNEL__ */
54
43
55
-
#endif /* defined(__sparc__) && defined(__arch64__) */
44
+
#endif /* defined(__sparc__) */
56
45
57
46
#endif /* defined(_SPARC_TYPES_H) */