diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-08 11:39:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-08 11:39:31 +0200 |
| commit | 97b57cab79c9686e1a98ae3e7aed84d87c8bc1eb (patch) | |
| tree | 2069d9d454bf5deff4285c88f021de558a30bfb1 /include | |
| parent | 401237a78c715870a96aad0677d656b02e6d7d02 (diff) | |
| parent | 71392a644e88c6bb921cdf12cb2b00adec070fe4 (diff) | |
| download | linux-next-97b57cab79c9686e1a98ae3e7aed84d87c8bc1eb.tar.gz linux-next-97b57cab79c9686e1a98ae3e7aed84d87c8bc1eb.zip | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git
Diffstat (limited to 'include')
| -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) { |