Message ID | 20170718172600.114761-1-salyzyn@android.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Tuesday, July 18, 2017 10:25:58 AM Mark Salyzyn wrote: > Permits power state and battery life diagnosis. > > Feature activated by CONFIG_RTC_SHOW_TIME. > > Signed-off-by: Mark Salyzyn <salyzyn@android.com> Please fold the [4/4] into this one and I have a patch series that you'd want to rebase this on I guess. I'll send it shortly. Thanks, Rafael
On 07/18/2017 03:25 PM, Rafael J. Wysocki wrote: > On Tuesday, July 18, 2017 10:25:58 AM Mark Salyzyn wrote: >> Permits power state and battery life diagnosis. >> >> Feature activated by CONFIG_RTC_SHOW_TIME. >> >> Signed-off-by: Mark Salyzyn <salyzyn@android.com> > Please fold the [4/4] into this one and I have a patch series that you'd > want to rebase this on I guess. I'll send it shortly. > > Thanks, > Rafael > Ok, after all the disputes are laid to rest, I will roll these in together on the respin.
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 3ecf275d7e44..f44d2152ab3f 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -26,6 +26,7 @@ #include <linux/suspend.h> #include <linux/syscore_ops.h> #include <linux/ftrace.h> +#include <linux/rtc.h> #include <trace/events/power.h> #include <linux/compiler.h> #include <linux/moduleparam.h> @@ -579,6 +580,7 @@ int pm_suspend(suspend_state_t state) if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) return -EINVAL; + rtc_show_time("PM: suspend entry"); error = enter_state(state); if (error) { suspend_stats.fail++; @@ -586,6 +588,7 @@ int pm_suspend(suspend_state_t state) } else { suspend_stats.success++; } + rtc_show_time("PM: suspend exit"); return error; } EXPORT_SYMBOL(pm_suspend);
Permits power state and battery life diagnosis. Feature activated by CONFIG_RTC_SHOW_TIME. Signed-off-by: Mark Salyzyn <salyzyn@android.com> --- kernel/power/suspend.c | 3 +++ 1 file changed, 3 insertions(+)