diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 11:53:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 11:53:35 +0100 |
| commit | 1cc9c59569e0ec69e9beadfe6ba8b2b7b22d57f0 (patch) | |
| tree | c320e74151142a12ec427ededd2ac2fe18ce5a97 /include/linux | |
| parent | 15efb47dc560849d0c07db96fdad5121f2cf736e (diff) | |
| parent | a08c2a5a31941131c41feaa0429e4c8854cf48f2 (diff) | |
| download | linux-1cc9c59569e0ec69e9beadfe6ba8b2b7b22d57f0.tar.gz | |
Merge back earlier PM core material for v5.1.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm.h | 6 | ||||
| -rw-r--r-- | include/linux/pm_runtime.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 0bd9de116826..3d2cbf947768 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -633,9 +633,9 @@ struct dev_pm_info { int runtime_error; int autosuspend_delay; u64 last_busy; - unsigned long active_jiffies; - unsigned long suspended_jiffies; - unsigned long accounting_timestamp; + u64 active_time; + u64 suspended_time; + u64 accounting_timestamp; #endif struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */ void (*set_latency_tolerance)(struct device *, s32); diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index fed5be706bc9..9dc6eebf62d2 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -113,6 +113,8 @@ static inline bool pm_runtime_is_irq_safe(struct device *dev) return dev->power.irq_safe; } +extern u64 pm_runtime_suspended_time(struct device *dev); + #else /* !CONFIG_PM */ static inline bool queue_pm_work(struct work_struct *work) { return false; } |