aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-02-08 00:09:04 -0500
committerH. Peter Anvin <hpa@zytor.com>2012-02-14 15:01:30 -0500
commit2759e6512e0bd9f9a84e10f59fb71195e7ff9775 (patch)
treed931160f25f083ead3295d9448b6c6f8e3b5292f
parent07d620212d51d113fad997357a75f5e1f2ffd5a7 (diff)
xtensa: Use generic posix_types.h
Change the xtensa architecture to use <asm-generic/posix_types.h>. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Link: http://lkml.kernel.org/r/1328677745-20121-21-git-send-email-hpa@zytor.com Cc: Chris Zankel <chris@zankel.net>
-rw-r--r--arch/xtensa/include/asm/posix_types.h97
1 files changed, 7 insertions, 90 deletions
diff --git a/arch/xtensa/include/asm/posix_types.h b/arch/xtensa/include/asm/posix_types.h
index 6b2190c35882..6e96be0d02d3 100644
--- a/arch/xtensa/include/asm/posix_types.h
+++ b/arch/xtensa/include/asm/posix_types.h
@@ -19,104 +19,21 @@
19 * assume GCC is being used. 19 * assume GCC is being used.
20 */ 20 */
21 21
22typedef unsigned long __kernel_ino_t;
23typedef unsigned int __kernel_mode_t;
24typedef unsigned long __kernel_nlink_t;
25typedef long __kernel_off_t;
26typedef int __kernel_pid_t;
27typedef unsigned short __kernel_ipc_pid_t; 22typedef unsigned short __kernel_ipc_pid_t;
28typedef unsigned int __kernel_uid_t; 23#define __kernel_ipc_pid_t __kernel_ipc_pid_t
29typedef unsigned int __kernel_gid_t; 24
30typedef unsigned int __kernel_size_t; 25typedef unsigned int __kernel_size_t;
31typedef int __kernel_ssize_t; 26typedef int __kernel_ssize_t;
32typedef long __kernel_ptrdiff_t; 27typedef long __kernel_ptrdiff_t;
33typedef long __kernel_time_t; 28#define __kernel_size_t __kernel_size_t
34typedef long __kernel_suseconds_t;
35typedef long __kernel_clock_t;
36typedef int __kernel_timer_t;
37typedef int __kernel_clockid_t;
38typedef int __kernel_daddr_t;
39typedef char * __kernel_caddr_t;
40typedef unsigned short __kernel_uid16_t;
41typedef unsigned short __kernel_gid16_t;
42typedef unsigned int __kernel_uid32_t;
43typedef unsigned int __kernel_gid32_t;
44 29
45typedef unsigned short __kernel_old_uid_t; 30typedef unsigned short __kernel_old_uid_t;
46typedef unsigned short __kernel_old_gid_t; 31typedef unsigned short __kernel_old_gid_t;
47typedef unsigned short __kernel_old_dev_t; 32#define __kernel_old_uid_t __kernel_old_uid_t
48
49#ifdef __GNUC__
50typedef long long __kernel_loff_t;
51#endif
52
53typedef struct {
54 int val[2];
55} __kernel_fsid_t;
56
57#ifndef __GNUC__
58
59#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
60#define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
61#define __FD_ISSET(d, set) (!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))
62#define __FD_ZERO(set) \
63 ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))
64
65#else /* __GNUC__ */
66 33
67#if defined(__KERNEL__) 34typedef unsigned short __kernel_old_dev_t;
68/* With GNU C, use inline functions instead so args are evaluated only once: */ 35#define __kernel_old_dev_t __kernel_old_dev_t
69
70#undef __FD_SET
71static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
72{
73 unsigned long _tmp = fd / __NFDBITS;
74 unsigned long _rem = fd % __NFDBITS;
75 fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
76}
77
78#undef __FD_CLR
79static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
80{
81 unsigned long _tmp = fd / __NFDBITS;
82 unsigned long _rem = fd % __NFDBITS;
83 fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
84}
85
86#undef __FD_ISSET
87static __inline__ int __FD_ISSET(unsigned long fd, __kernel_fd_set *p)
88{
89 unsigned long _tmp = fd / __NFDBITS;
90 unsigned long _rem = fd % __NFDBITS;
91 return (p->fds_bits[_tmp] & (1UL<<_rem)) != 0;
92}
93
94/*
95 * This will unroll the loop for the normal constant case (8 ints,
96 * for a 256-bit fd_set)
97 */
98#undef __FD_ZERO
99static __inline__ void __FD_ZERO(__kernel_fd_set *p)
100{
101 unsigned int *tmp = (unsigned int *)p->fds_bits;
102 int i;
103 36
104 if (__builtin_constant_p(__FDSET_LONGS)) { 37#include <asm-generic/posix_types.h>
105 switch (__FDSET_LONGS) {
106 case 8:
107 tmp[0] = 0; tmp[1] = 0; tmp[2] = 0; tmp[3] = 0;
108 tmp[4] = 0; tmp[5] = 0; tmp[6] = 0; tmp[7] = 0;
109 return;
110 }
111 }
112 i = __FDSET_LONGS;
113 while (i) {
114 i--;
115 *tmp = 0;
116 tmp++;
117 }
118}
119 38
120#endif /* defined(__KERNEL__) */
121#endif /* __GNUC__ */
122#endif /* _XTENSA_POSIX_TYPES_H */ 39#endif /* _XTENSA_POSIX_TYPES_H */