diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-25 23:43:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-25 23:43:05 +0100 |
| commit | 0015afaa1f818d38ea9f8e81a84a6aeeca5fdaf0 (patch) | |
| tree | 8f8279cf0117d210230ef9fcacb05f960bf6f8f5 /include/linux/pm.h | |
| parent | b7ba68c4a072c9aa8f04b8cf7838b6cd2f48d918 (diff) | |
| parent | 00dc9ad18d707f36b2fb4af98fd2cf0548d2b258 (diff) | |
Merge branch 'pm-runtime' into pm-for-linus
* pm-runtime:
PM / Runtime: Use device PM QoS constraints (v2)
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
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; |