CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT. Adjust the comments in the locking code.
Unified · Split
| @@ -214,7 +214,7 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) · 213 unmodified lines | |||
| 214 | 214 | ||
| 215 | /* | 215 | /* |
| 216 | * Define the various spin_lock methods. Note we define these | 216 | * Define the various spin_lock methods. Note we define these |
| 217 | * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The | 217 | * regardless of whether CONFIG_SMP or CONFIG_PREEMPTION are set. The |
| 218 | * various methods are defined as nops in the case they are not | 218 | * various methods are defined as nops in the case they are not |
| 219 | * required. | 219 | * required. |
| 220 | */ | 220 | */ |
| @@ -96,7 +96,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock) · 95 unmodified lines | |||
| 96 | 96 | ||
| 97 | /* | 97 | /* |
| 98 | * If lockdep is enabled then we use the non-preemption spin-ops | 98 | * If lockdep is enabled then we use the non-preemption spin-ops |
| 99 | * even on CONFIG_PREEMPT, because lockdep assumes that interrupts are | 99 | * even on CONFIG_PREEMPTION, because lockdep assumes that interrupts are |
| 100 | * not re-enabled during lock-acquire (which the preempt-spin-ops do): | 100 | * not re-enabled during lock-acquire (which the preempt-spin-ops do): |
| 101 | */ | 101 | */ |
| 102 | #if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC) | 102 | #if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC) |