diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:50:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:50:26 +0200 |
| commit | aa10fab0f859ef86e998ee1cdaa89fc8e542e2c9 (patch) | |
| tree | d76af7ad635537fa59e033306f900408cd470168 /include/linux/device.h | |
| parent | USB: core: Check buffer length matches wLength for control transfers (diff) | |
| parent | Linux 5.13-rc4 (diff) | |
| download | linux-dev-aa10fab0f859ef86e998ee1cdaa89fc8e542e2c9.tar.xz linux-dev-aa10fab0f859ef86e998ee1cdaa89fc8e542e2c9.zip | |
Merge 5.13-rc4 into usb-next
We need the usb/thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 8566fa98b239..73b9d7810502 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -591,7 +591,7 @@ struct device { * @flags: Link flags. * @rpm_active: Whether or not the consumer device is runtime-PM-active. * @kref: Count repeated addition of the same link. - * @rcu_head: An RCU head to use for deferred execution of SRCU callbacks. + * @rm_work: Work structure used for removing the link. * @supplier_preactivated: Supplier has been made active before consumer probe. */ struct device_link { @@ -604,9 +604,7 @@ struct device_link { u32 flags; refcount_t rpm_active; struct kref kref; -#ifdef CONFIG_SRCU - struct rcu_head rcu_head; -#endif + struct work_struct rm_work; bool supplier_preactivated; /* Owned by consumer probe. */ }; |