aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-alpha
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-04-06 13:35:00 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-05-02 19:18:20 -0400
commit3726c23df8e4d95b6f2b335dfa90e3f4850a8a00 (patch)
treec90d40b9224b90bc00ca23fc8f9b4d00739b6f06 /include/asm-alpha
parentd13ff31cfeedbf2fefc7ba13cb753775648eac0c (diff)
alpha: types: use <asm-generic/int-*.h> for the alpha architecture
This modifies <asm-alpha/types.h> to use the <asm-generic/int-*.h> generic include files. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Diffstat (limited to 'include/asm-alpha')
-rw-r--r--include/asm-alpha/types.h36
1 files changed, 1 insertions, 35 deletions
diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h
index f5716139ec89..a9e34ca4d463 100644
--- a/include/asm-alpha/types.h
+++ b/include/asm-alpha/types.h
@@ -8,28 +8,12 @@
8 * not a major issue. However, for interoperability, libraries still 8 * not a major issue. However, for interoperability, libraries still
9 * need to be careful to avoid a name clashes. 9 * need to be careful to avoid a name clashes.
10 */ 10 */
11#include <asm-generic/int-l64.h>
11 12
12#ifndef __ASSEMBLY__ 13#ifndef __ASSEMBLY__
13 14
14typedef unsigned int umode_t; 15typedef unsigned int umode_t;
15 16
16/*
17 * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
18 * header files exported to user space
19 */
20
21typedef __signed__ char __s8;
22typedef unsigned char __u8;
23
24typedef __signed__ short __s16;
25typedef unsigned short __u16;
26
27typedef __signed__ int __s32;
28typedef unsigned int __u32;
29
30typedef __signed__ long __s64;
31typedef unsigned long __u64;
32
33#endif /* __ASSEMBLY__ */ 17#endif /* __ASSEMBLY__ */
34 18
35/* 19/*
@@ -39,23 +23,5 @@ typedef unsigned long __u64;
39 23
40#define BITS_PER_LONG 64 24#define BITS_PER_LONG 64
41 25
42#ifndef __ASSEMBLY__
43
44typedef signed char s8;
45typedef unsigned char u8;
46
47typedef signed short s16;
48typedef unsigned short u16;
49
50typedef signed int s32;
51typedef unsigned int u32;
52
53typedef signed long s64;
54typedef unsigned long u64;
55
56typedef u64 dma_addr_t;
57typedef u64 dma64_addr_t;
58
59#endif /* __ASSEMBLY__ */
60#endif /* __KERNEL__ */ 26#endif /* __KERNEL__ */
61#endif /* _ALPHA_TYPES_H */ 27#endif /* _ALPHA_TYPES_H */