diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-04-06 13:35:09 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-02 19:18:32 -0400 |
commit | 849bf3a09fdcf9dbbe060da0f5bce90231b14625 (patch) | |
tree | 843324d19e5c78eb0bde2b51354548a25b322c49 /include/asm-parisc | |
parent | 8523437b4c664cfc0f11998c4274846b95182000 (diff) |
parisc: types: use <asm-generic/int-*.h> for the parisc architecture
This modifies <asm-parisc/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Grant Grundler <grundler@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/types.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-parisc/types.h b/include/asm-parisc/types.h index 56c84802da59..7f5a39bfb4ce 100644 --- a/include/asm-parisc/types.h +++ b/include/asm-parisc/types.h | |||
@@ -1,29 +1,12 @@ | |||
1 | #ifndef _PARISC_TYPES_H | 1 | #ifndef _PARISC_TYPES_H |
2 | #define _PARISC_TYPES_H | 2 | #define _PARISC_TYPES_H |
3 | 3 | ||
4 | #include <asm-generic/int-ll64.h> | ||
5 | |||
4 | #ifndef __ASSEMBLY__ | 6 | #ifndef __ASSEMBLY__ |
5 | 7 | ||
6 | typedef unsigned short umode_t; | 8 | typedef unsigned short umode_t; |
7 | 9 | ||
8 | /* | ||
9 | * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | ||
10 | * header files exported to user space | ||
11 | */ | ||
12 | |||
13 | typedef __signed__ char __s8; | ||
14 | typedef unsigned char __u8; | ||
15 | |||
16 | typedef __signed__ short __s16; | ||
17 | typedef unsigned short __u16; | ||
18 | |||
19 | typedef __signed__ int __s32; | ||
20 | typedef unsigned int __u32; | ||
21 | |||
22 | #if defined(__GNUC__) | ||
23 | __extension__ typedef __signed__ long long __s64; | ||
24 | __extension__ typedef unsigned long long __u64; | ||
25 | #endif | ||
26 | |||
27 | #endif /* __ASSEMBLY__ */ | 10 | #endif /* __ASSEMBLY__ */ |
28 | 11 | ||
29 | /* | 12 | /* |
@@ -41,18 +24,6 @@ __extension__ typedef unsigned long long __u64; | |||
41 | 24 | ||
42 | #ifndef __ASSEMBLY__ | 25 | #ifndef __ASSEMBLY__ |
43 | 26 | ||
44 | typedef signed char s8; | ||
45 | typedef unsigned char u8; | ||
46 | |||
47 | typedef signed short s16; | ||
48 | typedef unsigned short u16; | ||
49 | |||
50 | typedef signed int s32; | ||
51 | typedef unsigned int u32; | ||
52 | |||
53 | typedef signed long long s64; | ||
54 | typedef unsigned long long u64; | ||
55 | |||
56 | /* Dma addresses are 32-bits wide. */ | 27 | /* Dma addresses are 32-bits wide. */ |
57 | 28 | ||
58 | typedef u32 dma_addr_t; | 29 | typedef u32 dma_addr_t; |