diff options
| author | Grygorii Strashko <[email protected]> | 2020-09-18 19:55:18 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2020-09-28 16:38:11 +0200 |
| commit | 6b61d49a55796dbbc479eeb4465e59fd656c719c (patch) | |
| tree | 343abccab032e78957781522b843f397b2bc2dbe | |
| parent | d12544fb2aa9944b180c35914031a8384ab082c1 (diff) | |
PM: runtime: Fix timer_expires data type on 32-bit arches
Commit 8234f6734c5d ("PM-runtime: Switch autosuspend over to using
hrtimers") switched PM runtime autosuspend to use hrtimers and all
related time accounting in ns, but missed to update the timer_expires
data type in struct dev_pm_info to u64.
This causes the timer_expires value to be truncated on 32-bit
architectures when assignment is done from u64 values:
rpm_suspend()
|- dev->power.timer_expires = expires;
Fix it by changing the timer_expires type to u64.
Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers")
Signed-off-by: Grygorii Strashko <[email protected]>
Acked-by: Pavel Machek <[email protected]>
Acked-by: Vincent Guittot <[email protected]>
Cc: 5.0+ <[email protected]> # 5.0+
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <[email protected]>
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index a30a4b54df52..47aca6bac1d6 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -590,7 +590,7 @@ struct dev_pm_info { #endif #ifdef CONFIG_PM struct hrtimer suspend_timer; - unsigned long timer_expires; + u64 timer_expires; struct work_struct work; wait_queue_head_t wait_queue; struct wake_irq *wakeirq; |