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

* pm-runtime: PM / Runtime: Use device PM QoS constraints (v2)
2011-12-25 23:43:05 +01:00
parent b7ba68c4a0 00dc9ad18d
commit 0015afaa1f
5 changed files with 154 additions and 28 deletions
--- 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;