kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/kernel/locking/rtmutex_common.h
..
..
@@ -15,7 +15,6 @@
15
15
 
16
16
 #include <linux/rtmutex.h>
17
17
 #include <linux/sched/wake_q.h>
18
-#include <linux/sched/debug.h>
19
18
 
20
19
 /*
21
20
  * This is the control structure for tasks blocked on a rt_mutex,
..
..
@@ -30,7 +29,6 @@
30
29
 	struct rb_node          pi_tree_entry;
31
30
 	struct task_struct	*task;
32
31
 	struct rt_mutex		*lock;
33
-	bool			savestate;
34
32
 #ifdef CONFIG_DEBUG_RT_MUTEXES
35
33
 	unsigned long		ip;
36
34
 	struct pid		*deadlock_task_pid;
..
..
@@ -132,14 +130,11 @@
132
130
 /*
133
131
  * PI-futex support (proxy locking functions, etc.):
134
132
  */
135
-#define PI_WAKEUP_INPROGRESS	((struct rt_mutex_waiter *) 1)
136
-#define PI_REQUEUE_INPROGRESS	((struct rt_mutex_waiter *) 2)
137
-
138
133
 extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
139
134
 extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
140
135
 				       struct task_struct *proxy_owner);
141
136
 extern void rt_mutex_proxy_unlock(struct rt_mutex *lock);
142
-extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savetate);
137
+extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
143
138
 extern int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
144
139
 				     struct rt_mutex_waiter *waiter,
145
140
 				     struct task_struct *task);
..
..
@@ -157,27 +152,9 @@
157
152
 
158
153
 extern void rt_mutex_futex_unlock(struct rt_mutex *lock);
159
154
 extern bool __rt_mutex_futex_unlock(struct rt_mutex *lock,
160
-				 struct wake_q_head *wqh,
161
-				 struct wake_q_head *wq_sleeper);
155
+				 struct wake_q_head *wqh);
162
156
 
163
-extern void rt_mutex_postunlock(struct wake_q_head *wake_q,
164
-				struct wake_q_head *wake_sleeper_q);
165
-
166
-/* RW semaphore special interface */
167
-struct ww_acquire_ctx;
168
-
169
-extern int __rt_mutex_lock_state(struct rt_mutex *lock, int state);
170
-extern int __rt_mutex_trylock(struct rt_mutex *lock);
171
-extern void __rt_mutex_unlock(struct rt_mutex *lock);
172
-int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
173
-				     struct hrtimer_sleeper *timeout,
174
-				     enum rtmutex_chainwalk chwalk,
175
-				     struct ww_acquire_ctx *ww_ctx,
176
-				     struct rt_mutex_waiter *waiter);
177
-void __sched rt_spin_lock_slowlock_locked(struct rt_mutex *lock,
178
-					  struct rt_mutex_waiter *waiter,
179
-					  unsigned long flags);
180
-void __sched rt_spin_lock_slowunlock(struct rt_mutex *lock);
157
+extern void rt_mutex_postunlock(struct wake_q_head *wake_q);
181
158
 
182
159
 #ifdef CONFIG_DEBUG_RT_MUTEXES
183
160
 # include "rtmutex-debug.h"