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/pm.h | |
| parent | PM-runtime: Fix deadlock with ktime_get() (diff) | |
| parent | PM-runtime: Replace jiffies-based accounting with ktime-based accounting (diff) | |
| download | wireguard-linux-1cc9c59569e0ec69e9beadfe6ba8b2b7b22d57f0.tar.xz wireguard-linux-1cc9c59569e0ec69e9beadfe6ba8b2b7b22d57f0.zip | |
Merge back earlier PM core material for v5.1.
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 6 |
1 files changed, 3 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); |