Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Runtime: Use device PM QoS constraints (v2)

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 21e04dd72a8..e4982ac3fbb 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -508,6 +508,8 @@ struct dev_pm_info {
         unsigned long           active_jiffies;
         unsigned long           suspended_jiffies;
         unsigned long           accounting_timestamp;
+        ktime_t                 suspend_time;
+        s64                     max_time_suspended_ns;
 #endif
         struct pm_subsys_data   *subsys_data;  /* Owned by the subsystem. */
         struct pm_qos_constraints *constraints;