diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-13 11:36:23 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-18 21:42:24 -0400 |
commit | 0f652859571b3f750c01c9d7c27938d3159ca96d (patch) | |
tree | e149a65686036acac8f0f344d8f6b5cddc187794 /arch | |
parent | d5ce528c8e46fa5afb9ff021514a6658d1758b4e (diff) |
Blackfin: convert types to asm-generic
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/include/asm/posix_types.h | 56 | ||||
-rw-r--r-- | arch/blackfin/include/asm/types.h | 37 |
2 files changed, 12 insertions, 81 deletions
diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 23aa1f8c1bd1..80c9d64eb26c 100644 --- a/arch/blackfin/include/asm/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h | |||
@@ -1,61 +1,27 @@ | |||
1 | #ifndef __ARCH_BFIN_POSIX_TYPES_H | 1 | #ifndef __ARCH_BFIN_POSIX_TYPES_H |
2 | #define __ARCH_BFIN_POSIX_TYPES_H | 2 | #define __ARCH_BFIN_POSIX_TYPES_H |
3 | 3 | ||
4 | /* | ||
5 | * This file is generally used by user-level software, so you need to | ||
6 | * be a little careful about namespace pollution etc. Also, we cannot | ||
7 | * assume GCC is being used. | ||
8 | */ | ||
9 | |||
10 | typedef unsigned long __kernel_ino_t; | ||
11 | typedef unsigned short __kernel_mode_t; | 4 | typedef unsigned short __kernel_mode_t; |
5 | #define __kernel_mode_t __kernel_mode_t | ||
6 | |||
12 | typedef unsigned short __kernel_nlink_t; | 7 | typedef unsigned short __kernel_nlink_t; |
13 | typedef long __kernel_off_t; | 8 | #define __kernel_nlink_t __kernel_nlink_t |
14 | typedef int __kernel_pid_t; | 9 | |
15 | typedef unsigned int __kernel_ipc_pid_t; | 10 | typedef unsigned int __kernel_ipc_pid_t; |
16 | typedef unsigned int __kernel_uid_t; | 11 | #define __kernel_ipc_pid_t __kernel_ipc_pid_t |
17 | typedef unsigned int __kernel_gid_t; | 12 | |
18 | typedef unsigned long __kernel_size_t; | 13 | typedef unsigned long __kernel_size_t; |
19 | typedef long __kernel_ssize_t; | 14 | typedef long __kernel_ssize_t; |
20 | typedef int __kernel_ptrdiff_t; | 15 | typedef int __kernel_ptrdiff_t; |
21 | typedef long __kernel_time_t; | 16 | #define __kernel_size_t __kernel_size_t |
22 | typedef long __kernel_suseconds_t; | ||
23 | typedef long __kernel_clock_t; | ||
24 | typedef int __kernel_timer_t; | ||
25 | typedef int __kernel_clockid_t; | ||
26 | typedef int __kernel_daddr_t; | ||
27 | typedef char *__kernel_caddr_t; | ||
28 | typedef unsigned short __kernel_uid16_t; | ||
29 | typedef unsigned short __kernel_gid16_t; | ||
30 | typedef unsigned int __kernel_uid32_t; | ||
31 | typedef unsigned int __kernel_gid32_t; | ||
32 | 17 | ||
33 | typedef unsigned short __kernel_old_uid_t; | 18 | typedef unsigned short __kernel_old_uid_t; |
34 | typedef unsigned short __kernel_old_gid_t; | 19 | typedef unsigned short __kernel_old_gid_t; |
35 | typedef unsigned short __kernel_old_dev_t; | 20 | #define __kernel_old_uid_t __kernel_old_uid_t |
36 | |||
37 | #ifdef __GNUC__ | ||
38 | typedef long long __kernel_loff_t; | ||
39 | #endif | ||
40 | 21 | ||
41 | typedef struct { | 22 | typedef unsigned short __kernel_old_dev_t; |
42 | int val[2]; | 23 | #define __kernel_old_dev_t __kernel_old_dev_t |
43 | } __kernel_fsid_t; | ||
44 | |||
45 | #if defined(__KERNEL__) | ||
46 | |||
47 | #undef __FD_SET | ||
48 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | ||
49 | |||
50 | #undef __FD_CLR | ||
51 | #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) | ||
52 | |||
53 | #undef __FD_ISSET | ||
54 | #define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) | ||
55 | |||
56 | #undef __FD_ZERO | ||
57 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | ||
58 | 24 | ||
59 | #endif /* defined(__KERNEL__) */ | 25 | #include <asm-generic/posix_types.h> |
60 | 26 | ||
61 | #endif | 27 | #endif |
diff --git a/arch/blackfin/include/asm/types.h b/arch/blackfin/include/asm/types.h index 8441cbc2bf9e..b9e79bc580dd 100644 --- a/arch/blackfin/include/asm/types.h +++ b/arch/blackfin/include/asm/types.h | |||
@@ -1,36 +1 @@ | |||
1 | #ifndef _BFIN_TYPES_H | #include <asm-generic/types.h> | |
2 | #define _BFIN_TYPES_H | ||
3 | |||
4 | /* | ||
5 | * This file is never included by application software unless | ||
6 | * explicitly requested (e.g., via linux/types.h) in which case the | ||
7 | * application is Linux specific so (user-) name space pollution is | ||
8 | * not a major issue. However, for interoperability, libraries still | ||
9 | * need to be careful to avoid a name clashes. | ||
10 | */ | ||
11 | #include <asm-generic/int-ll64.h> | ||
12 | |||
13 | #ifndef __ASSEMBLY__ | ||
14 | |||
15 | typedef unsigned short umode_t; | ||
16 | |||
17 | #endif /* __ASSEMBLY__ */ | ||
18 | /* | ||
19 | * These aren't exported outside the kernel to avoid name space clashes | ||
20 | */ | ||
21 | #ifdef __KERNEL__ | ||
22 | |||
23 | #define BITS_PER_LONG 32 | ||
24 | |||
25 | #ifndef __ASSEMBLY__ | ||
26 | |||
27 | /* Dma addresses are 32-bits wide. */ | ||
28 | |||
29 | typedef u32 dma_addr_t; | ||
30 | typedef u64 dma64_addr_t; | ||
31 | |||
32 | #endif /* __ASSEMBLY__ */ | ||
33 | |||
34 | #endif /* __KERNEL__ */ | ||
35 | |||
36 | #endif /* _BFIN_TYPES_H */ | ||