移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/linux/spinlock_rt.h
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 #ifndef __LINUX_SPINLOCK_RT_H
2
3
 #define __LINUX_SPINLOCK_RT_H
3
4
 
..
..
@@ -19,10 +20,10 @@
19
20
 } while (0)
20
21
 
21
22
 extern void __lockfunc rt_spin_lock(spinlock_t *lock);
22
-extern unsigned long __lockfunc rt_spin_lock_trace_flags(spinlock_t *lock);
23
23
 extern void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass);
24
+extern void __lockfunc rt_spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *nest_lock);
24
25
 extern void __lockfunc rt_spin_unlock(spinlock_t *lock);
25
-extern void __lockfunc rt_spin_unlock_wait(spinlock_t *lock);
26
+extern void __lockfunc rt_spin_lock_unlock(spinlock_t *lock);
26
27
 extern int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags);
27
28
 extern int __lockfunc rt_spin_trylock_bh(spinlock_t *lock);
28
29
 extern int __lockfunc rt_spin_trylock(spinlock_t *lock);
..
..
@@ -68,6 +69,12 @@
68
69
 		rt_spin_lock_nested(lock, subclass);	\
69
70
 	} while (0)
70
71
 
72
+# define spin_lock_nest_lock(lock, subclass)		\
73
+	do {                                                           \
74
+		typecheck(struct lockdep_map *, &(subclass)->dep_map);	\
75
+		rt_spin_lock_nest_lock(lock, &(subclass)->dep_map);	\
76
+	} while (0)
77
+
71
78
 # define spin_lock_irqsave_nested(lock, flags, subclass) \
72
79
 	do {						 \
73
80
 		typecheck(unsigned long, flags);	 \
..
..
@@ -75,14 +82,15 @@
75
82
 		rt_spin_lock_nested(lock, subclass);	 \
76
83
 	} while (0)
77
84
 #else
78
-# define spin_lock_nested(lock, subclass)	spin_lock(lock)
79
-# define spin_lock_bh_nested(lock, subclass)	spin_lock_bh(lock)
85
+# define spin_lock_nested(lock, subclass)	spin_lock(((void)(subclass), (lock)))
86
+# define spin_lock_nest_lock(lock, subclass)	spin_lock(((void)(subclass), (lock)))
87
+# define spin_lock_bh_nested(lock, subclass)	spin_lock_bh(((void)(subclass), (lock)))
80
88
 
81
89
 # define spin_lock_irqsave_nested(lock, flags, subclass) \
82
90
 	do {						 \
83
91
 		typecheck(unsigned long, flags);	 \
84
92
 		flags = 0;				 \
85
-		spin_lock(lock);			 \
93
+		spin_lock(((void)(subclass), (lock)));	 \
86
94
 	} while (0)
87
95
 #endif
88
96
 
..
..
@@ -92,20 +100,6 @@
92
100
 		flags = 0;				 \
93
101
 		spin_lock(lock);			 \
94
102
 	} while (0)
95
-
96
-static inline unsigned long spin_lock_trace_flags(spinlock_t *lock)
97
-{
98
-	unsigned long flags = 0;
99
-#ifdef CONFIG_TRACE_IRQFLAGS
100
-	flags = rt_spin_lock_trace_flags(lock);
101
-#else
102
-	spin_lock(lock); /* lock_local */
103
-#endif
104
-	return flags;
105
-}
106
-
107
-/* FIXME: we need rt_spin_lock_nest_lock */
108
-#define spin_lock_nest_lock(lock, nest_lock) spin_lock_nested(lock, 0)
109
103
 
110
104
 #define spin_unlock(lock)			rt_spin_unlock(lock)
111
105
 
..
..
@@ -127,10 +121,15 @@
127
121
 #define spin_trylock_bh(lock)	__cond_lock(lock, rt_spin_trylock_bh(lock))
128
122
 #define spin_trylock_irq(lock)	spin_trylock(lock)
129
123
 
130
-#define spin_trylock_irqsave(lock, flags)	\
131
-	rt_spin_trylock_irqsave(lock, &(flags))
132
-
133
-#define spin_unlock_wait(lock)		rt_spin_unlock_wait(lock)
124
+#define spin_trylock_irqsave(lock, flags)		\
125
+({							\
126
+	int __locked;					\
127
+							\
128
+	typecheck(unsigned long, flags);		\
129
+	flags = 0;					\
130
+	__locked = spin_trylock(lock);			\
131
+	__locked;					\
132
+})
134
133
 
135
134
 #ifdef CONFIG_GENERIC_LOCKBREAK
136
135
 # define spin_is_contended(lock)	((lock)->break_lock)