kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/kernel/locking/Makefile
..
..
@@ -3,7 +3,7 @@
3
3
 # and is generally not a function of system call inputs.
4
4
 KCOV_INSTRUMENT		:= n
5
5
 
6
-obj-y += semaphore.o rwsem.o percpu-rwsem.o
6
+obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
7
7
 
8
8
 # Avoid recursion lockdep -> KCSAN -> ... -> lockdep.
9
9
 KCSAN_SANITIZE_lockdep.o := n
..
..
@@ -15,23 +15,19 @@
15
15
 CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
16
16
 endif
17
17
 
18
+obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
18
19
 obj-$(CONFIG_LOCKDEP) += lockdep.o
19
20
 ifeq ($(CONFIG_PROC_FS),y)
20
21
 obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
21
22
 endif
22
23
 obj-$(CONFIG_SMP) += spinlock.o
24
+obj-$(CONFIG_LOCK_SPIN_ON_OWNER) += osq_lock.o
23
25
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
24
26
 obj-$(CONFIG_QUEUED_SPINLOCKS) += qspinlock.o
25
27
 obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
26
28
 obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
27
29
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
28
30
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
29
-ifneq ($(CONFIG_PREEMPT_RT),y)
30
-obj-y += mutex.o
31
-obj-$(CONFIG_LOCK_SPIN_ON_OWNER) += osq_lock.o
32
-obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
33
-endif
34
-obj-$(CONFIG_PREEMPT_RT) += mutex-rt.o rwsem-rt.o rwlock-rt.o
35
31
 obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
36
32
 obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
37
33
 obj-$(CONFIG_WW_MUTEX_SELFTEST) += test-ww_mutex.o