Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 0fe0de10 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Revert "timers, sched/clock: Hook into s2idle freeze path"



This reverts commit ea99d5c0.

This is a preparation change for merging android-4.19.37 into
msm-4.19 branch.

Functions sched_clock_suspend and sched_clock_resume are defined twice in
different header files by [1] and [2] ([1] is part of upmerge[3]).
When file includes those two header files, a redefinition error occurs.
To prevent this [2] is reverted.

[1] cd37fd46("timers/sched_clock: Prevent generic sched_clock wrap caused
by tick_freeze()")
[2] ea99d5c0("timers, sched/clock: Hook into s2idle freeze path")
[3] Merge android-4.19.37 (9bf59048) into msm-4.19.

Change-Id: I667a23598fd2a3bd2abcddd7286011b5ebc47559
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parent e0379e25
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment