.. | .. |
---|
65 | 65 | typedef __kernel_ptrdiff_t ptrdiff_t; |
---|
66 | 66 | #endif |
---|
67 | 67 | |
---|
68 | | -#ifndef _TIME_T |
---|
69 | | -#define _TIME_T |
---|
70 | | -typedef __kernel_time_t time_t; |
---|
71 | | -#endif |
---|
72 | | - |
---|
73 | 68 | #ifndef _CLOCK_T |
---|
74 | 69 | #define _CLOCK_T |
---|
75 | 70 | typedef __kernel_clock_t clock_t; |
---|
.. | .. |
---|
127 | 122 | * |
---|
128 | 123 | * blkcnt_t is the type of the inode's block count. |
---|
129 | 124 | */ |
---|
130 | | -#ifdef CONFIG_LBDAF |
---|
131 | 125 | typedef u64 sector_t; |
---|
132 | 126 | typedef u64 blkcnt_t; |
---|
133 | | -#else |
---|
134 | | -typedef unsigned long sector_t; |
---|
135 | | -typedef unsigned long blkcnt_t; |
---|
136 | | -#endif |
---|
137 | 127 | |
---|
138 | 128 | /* |
---|
139 | 129 | * The type of an index into the pagecache. |
---|
.. | .. |
---|
155 | 145 | typedef u32 dma_addr_t; |
---|
156 | 146 | #endif |
---|
157 | 147 | |
---|
158 | | -typedef unsigned __bitwise gfp_t; |
---|
159 | | -typedef unsigned __bitwise slab_flags_t; |
---|
160 | | -typedef unsigned __bitwise fmode_t; |
---|
| 148 | +typedef unsigned int __bitwise gfp_t; |
---|
| 149 | +typedef unsigned int __bitwise slab_flags_t; |
---|
| 150 | +typedef unsigned int __bitwise fmode_t; |
---|
161 | 151 | |
---|
162 | 152 | #ifdef CONFIG_PHYS_ADDR_T_64BIT |
---|
163 | 153 | typedef u64 phys_addr_t; |
---|
.. | .. |
---|
177 | 167 | int counter; |
---|
178 | 168 | } atomic_t; |
---|
179 | 169 | |
---|
| 170 | +#define ATOMIC_INIT(i) { (i) } |
---|
| 171 | + |
---|
180 | 172 | #ifdef CONFIG_64BIT |
---|
181 | 173 | typedef struct { |
---|
182 | | - long counter; |
---|
| 174 | + s64 counter; |
---|
183 | 175 | } atomic64_t; |
---|
184 | 176 | #endif |
---|
185 | 177 | |
---|
.. | .. |
---|
212 | 204 | * weird ABI and we need to ask it explicitly. |
---|
213 | 205 | * |
---|
214 | 206 | * The alignment is required to guarantee that bit 0 of @next will be |
---|
215 | | - * clear under normal conditions -- as long as we use call_rcu(), |
---|
216 | | - * call_rcu_bh(), call_rcu_sched(), or call_srcu() to queue callback. |
---|
| 207 | + * clear under normal conditions -- as long as we use call_rcu() or |
---|
| 208 | + * call_srcu() to queue the callback. |
---|
217 | 209 | * |
---|
218 | 210 | * This guarantee is important for few reasons: |
---|
219 | 211 | * - future call_rcu_lazy() will make use of lower bits in the pointer; |
---|
.. | .. |
---|
230 | 222 | typedef void (*rcu_callback_t)(struct rcu_head *head); |
---|
231 | 223 | typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func); |
---|
232 | 224 | |
---|
| 225 | +typedef void (*swap_func_t)(void *a, void *b, int size); |
---|
| 226 | + |
---|
| 227 | +typedef int (*cmp_r_func_t)(const void *a, const void *b, const void *priv); |
---|
| 228 | +typedef int (*cmp_func_t)(const void *a, const void *b); |
---|
| 229 | + |
---|
233 | 230 | #endif /* __ASSEMBLY__ */ |
---|
234 | 231 | #endif /* _LINUX_TYPES_H */ |
---|