Merge tag 'v5.3-rc7' into devel

Linux 5.3-rc7

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index c330b75c6c57..6717adee33f0 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -915,6 +915,8 @@ struct dev_links_info {
  *              This identifies the device type and carries type-specific
  *              information.
  * @mutex:      Mutex to synchronize calls to its driver.
+ * @lockdep_mutex: An optional debug lock that a subsystem can use as a
+ *              peer lock to gain localized lockdep coverage of the device_lock.
  * @bus:        Type of bus device is on.
  * @driver:     Which driver has allocated this
  * @platform_data: Platform data specific to the device.
@@ -998,6 +1000,9 @@ struct device {
                                            core doesn't touch it */
         void            *driver_data;   /* Driver data, set and get with
                                            dev_set_drvdata/dev_get_drvdata */
+#ifdef CONFIG_PROVE_LOCKING
+        struct mutex            lockdep_mutex;
+#endif
         struct mutex            mutex;  /* mutex to synchronize calls to
                                          * its driver.
                                          */
@@ -1383,6 +1388,7 @@ extern int (*platform_notify_remove)(struct device *dev);
  */
 extern struct device *get_device(struct device *dev);
 extern void put_device(struct device *dev);
+extern bool kill_device(struct device *dev);
 
 #ifdef CONFIG_DEVTMPFS
 extern int devtmpfs_create_node(struct device *dev);