diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2025-07-16 13:30:17 -0700 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2025-07-16 13:30:17 -0700 |
| commit | b873adfddeeb337fa8e9f381fd35eb94f7887f2f (patch) | |
| tree | 9a88156f8f6eab2d83c68ece96ef4ec5889d97bc /include/linux/mutex.h | |
| parent | 12b3d697c812aaf356e82d9e1f351fbb2ea97500 (diff) | |
| parent | d03fcf50ba56f4479685b951506422eeca230853 (diff) | |
Merge branch 'for-6.17/cxl-acquire' into cxl-for-next
Introduce ACQUIRE() and ACQUIRE_ERR() for conditional locks.
Convert CXL subsystem to use the new macros.
Diffstat (limited to 'include/linux/mutex.h')
| -rw-r--r-- | include/linux/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index a039fa8c1780..9d5d7ed5c101 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -224,7 +224,7 @@ extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); DEFINE_GUARD(mutex, struct mutex *, mutex_lock(_T), mutex_unlock(_T)) DEFINE_GUARD_COND(mutex, _try, mutex_trylock(_T)) -DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T) == 0) +DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T), _RET == 0) extern unsigned long mutex_get_owner(struct mutex *lock); |