summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2026-04-03 12:15:11 -0700
committerDave Jiang <dave.jiang@intel.com>2026-04-03 12:15:11 -0700
commit2fb3bdeb00111519965601389a7b60afb97bafc0 (patch)
tree546b18ad5180aa344022c266240ab5db624ca93d /include/linux
parentf3b1d2260703f8fb39fd667a26d931d63d2dd10e (diff)
parente8069c66d09309579e53567be8ddfa6ccb2f452a (diff)
Merge branch 'for-7.1/cxl-consolidate-endpoint' into cxl-for-next
Add code to ensure the endpoint has completed initialization before usage. cxl/pci: Check memdev driver binding status in cxl_reset_done() cxl/pci: Hold memdev lock in cxl_event_trace_record()
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 0be95294b6e6..4fafee80524b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -911,6 +911,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)
static inline void device_lock_assert(struct device *dev)
{