Skip to contentSkip to conversation

futex: Remove a PREEMPT_RT_FULL reference.

PATCH Applied Sebastian Andrzej Siewior 3 participants 3 messages May 11, 2022 – May 13, 2022 Futex

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 futex: Remove a PREEMPT_RT_FULL reference.

Earlier the PREEMPT_RT patch had a PREEMPT_RT_FULL and PREEMPT_RT_BASE Kconfig option. The latter was a subset the functionality that was enabled with PREEMPT_RT_FULL and was mainly useful for debugging.

During the merging efforts the two Kconfig options were abandoned in the v5.4.3-rt1 release and since then there is only PREEMPT_RT which enables the full features set (as PREEMPT_RT_FULL did in earlier releases).

Replace the PREEMPT_RT_FULL reference with PREEMPT_RT.

---
 kernel/futex/pi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/futex/pi.c +1 -1
index 183b28c32c832..ce2889f123755 100644
@@ -1005,7 +1005,7 @@ int futex_lock_pi(u32 __user *uaddr, unsigned int flags, ktime_t *time, int tryl
 	rt_mutex_init_waiter(&rt_waiter);
 
 	/*
-	 * On PREEMPT_RT_FULL, when hb->lock becomes an rt_mutex, we must not
+	 * On PREEMPT_RT, when hb->lock becomes an rt_mutex, we must not
 	 * hold it while doing rt_mutex_start_proxy(), because then it will
 	 * include hb->lock in the blocking chain, even through we'll not in
 	 * fact hold it while blocking. This will lead it to report -EDEADLK
Signature · 1 line
2.36.1
reviewer Reviewed-by on v1 1/1
#1 lore raw

Às 12:29 de 11/05/22, Sebastian Andrzej Siewior escreveu:

Quoted 4 lines

Earlier the PREEMPT_RT patch had a PREEMPT_RT_FULL and PREEMPT_RT_BASE Kconfig option. The latter was a subset the functionality that was enabled with PREEMPT_RT_FULL and was mainly useful for debugging.

Quoted 8 lines

During the merging efforts the two Kconfig options were abandoned in the v5.4.3-rt1 release and since then there is only PREEMPT_RT which enables the full features set (as PREEMPT_RT_FULL did in earlier releases).

Replace the PREEMPT_RT_FULL reference with PREEMPT_RT.

---

#2 lore raw
In reply to Sebastian Andrzej Siewior
The following commit has been merged into the locking/core branch of tip:

The following commit has been merged into the locking/core branch of tip:

Commit-ID:     6829061315065c7af394d556a887fbf847e4e708
Gitweb:        https://git.kernel.org/tip/6829061315065c7af394d556a887fbf847e4e708
Author:        Sebastian Andrzej Siewior <[email protected]>
AuthorDate:    Wed, 11 May 2022 17:29:22 +02:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 13 May 2022 12:36:51 +02:00

futex: Remove a PREEMPT_RT_FULL reference.

Earlier the PREEMPT_RT patch had a PREEMPT_RT_FULL and PREEMPT_RT_BASE Kconfig option. The latter was a subset of the functionality that was enabled with PREEMPT_RT_FULL and was mainly useful for debugging.

During the merging efforts the two Kconfig options were abandoned in the v5.4.3-rt1 release and since then there is only PREEMPT_RT which enables the full features set (as PREEMPT_RT_FULL did in earlier releases).

Replace the PREEMPT_RT_FULL reference with PREEMPT_RT.

---
 kernel/futex/pi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/futex/pi.c +1 -1
index 183b28c..ce2889f 100644
@@ -1005,7 +1005,7 @@ retry_private:
 	rt_mutex_init_waiter(&rt_waiter);
 
 	/*
-	 * On PREEMPT_RT_FULL, when hb->lock becomes an rt_mutex, we must not
+	 * On PREEMPT_RT, when hb->lock becomes an rt_mutex, we must not
 	 * hold it while doing rt_mutex_start_proxy(), because then it will
 	 * include hb->lock in the blocking chain, even through we'll not in
 	 * fact hold it while blocking. This will lead it to report -EDEADLK