diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-09 23:39:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-09 23:39:22 +0200 |
| commit | 7fcfa438567dc8188f4effeaceb555b2fc447221 (patch) | |
| tree | 7aa0a0bad69e5a0f783e89d2cb83c83342e54b3b /include/linux | |
| parent | df83044b65db946a3ef45911c49576f5618b7dc6 (diff) | |
| parent | 71392a644e88c6bb921cdf12cb2b00adec070fe4 (diff) | |
| download | linux-next-7fcfa438567dc8188f4effeaceb555b2fc447221.tar.gz linux-next-7fcfa438567dc8188f4effeaceb555b2fc447221.zip | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 90cdd77458bb..879eb758b5ee 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1121,6 +1121,7 @@ static inline void device_unlock(struct device *dev) DEFINE_GUARD(device, struct device *, device_lock(_T), device_unlock(_T)) DEFINE_GUARD_COND(device, _intr, device_lock_interruptible(_T), _RET == 0) +DEFINE_GUARD_COND(device, _try, device_trylock(_T)) static inline void device_lock_assert(struct device *dev) { |