hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/include/linux/types.h
....@@ -65,11 +65,6 @@
6565 typedef __kernel_ptrdiff_t ptrdiff_t;
6666 #endif
6767
68
-#ifndef _TIME_T
69
-#define _TIME_T
70
-typedef __kernel_time_t time_t;
71
-#endif
72
-
7368 #ifndef _CLOCK_T
7469 #define _CLOCK_T
7570 typedef __kernel_clock_t clock_t;
....@@ -127,13 +122,8 @@
127122 *
128123 * blkcnt_t is the type of the inode's block count.
129124 */
130
-#ifdef CONFIG_LBDAF
131125 typedef u64 sector_t;
132126 typedef u64 blkcnt_t;
133
-#else
134
-typedef unsigned long sector_t;
135
-typedef unsigned long blkcnt_t;
136
-#endif
137127
138128 /*
139129 * The type of an index into the pagecache.
....@@ -155,9 +145,9 @@
155145 typedef u32 dma_addr_t;
156146 #endif
157147
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;
161151
162152 #ifdef CONFIG_PHYS_ADDR_T_64BIT
163153 typedef u64 phys_addr_t;
....@@ -177,9 +167,11 @@
177167 int counter;
178168 } atomic_t;
179169
170
+#define ATOMIC_INIT(i) { (i) }
171
+
180172 #ifdef CONFIG_64BIT
181173 typedef struct {
182
- long counter;
174
+ s64 counter;
183175 } atomic64_t;
184176 #endif
185177
....@@ -212,8 +204,8 @@
212204 * weird ABI and we need to ask it explicitly.
213205 *
214206 * 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.
217209 *
218210 * This guarantee is important for few reasons:
219211 * - future call_rcu_lazy() will make use of lower bits in the pointer;
....@@ -230,5 +222,10 @@
230222 typedef void (*rcu_callback_t)(struct rcu_head *head);
231223 typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
232224
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
+
233230 #endif /* __ASSEMBLY__ */
234231 #endif /* _LINUX_TYPES_H */