diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2024-05-29 12:52:37 -0700 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2024-05-29 12:52:37 -0700 |
| commit | 718a7ad700b1ea86ae5a3ee636a275f98ba8ef86 (patch) | |
| tree | c7969c714c3867e713619bce748961a5bfdd5b33 /include/linux/hwspinlock.h | |
| parent | 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff) | |
| parent | 73100deb59c3892e280234fcc0171a5376c71788 (diff) | |
Merge branch '20240529-hwspinlock-bust-v3-2-c8b924ffa5a2@quicinc.com' into hwspinlock-next
Merge the introduction of hwspin_lock_bust() through a topic branch, so
that it can also be merged into the rproc-next branch. This to avoid any
potential conflicts between the two trees.
Diffstat (limited to 'include/linux/hwspinlock.h')
| -rw-r--r-- | include/linux/hwspinlock.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h index bfe7c1f1ac6d..f0231dbc4777 100644 --- a/include/linux/hwspinlock.h +++ b/include/linux/hwspinlock.h @@ -68,6 +68,7 @@ int __hwspin_lock_timeout(struct hwspinlock *, unsigned int, int, int __hwspin_trylock(struct hwspinlock *, int, unsigned long *); void __hwspin_unlock(struct hwspinlock *, int, unsigned long *); int of_hwspin_lock_get_id_byname(struct device_node *np, const char *name); +int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id); int devm_hwspin_lock_free(struct device *dev, struct hwspinlock *hwlock); struct hwspinlock *devm_hwspin_lock_request(struct device *dev); struct hwspinlock *devm_hwspin_lock_request_specific(struct device *dev, @@ -127,6 +128,11 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) { } +static inline int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id) +{ + return 0; +} + static inline int of_hwspin_lock_get_id(struct device_node *np, int index) { return 0; |