mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Merge "kernel: time: Restore original wheel index calculation"
This commit is contained in:
commit
f81e2b21f7
1 changed files with 8 additions and 0 deletions
|
|
@ -491,6 +491,13 @@ static inline void timer_set_idx(struct timer_list *timer, unsigned int idx)
|
|||
* Helper function to calculate the array index for a given expiry
|
||||
* time.
|
||||
*/
|
||||
#ifndef CONFIG_SCHED_WALT
|
||||
static inline unsigned calc_index(unsigned expires, unsigned lvl)
|
||||
{
|
||||
expires = (expires + LVL_GRAN(lvl)) >> LVL_SHIFT(lvl);
|
||||
return LVL_OFFS(lvl) + (expires & LVL_MASK);
|
||||
}
|
||||
#else
|
||||
static inline unsigned calc_index(unsigned expires, unsigned lvl)
|
||||
{
|
||||
if (lvl != 0 && (expires & ~(UINT_MAX << LVL_SHIFT(lvl))))
|
||||
|
|
@ -500,6 +507,7 @@ static inline unsigned calc_index(unsigned expires, unsigned lvl)
|
|||
|
||||
return LVL_OFFS(lvl) + (expires & LVL_MASK);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int calc_wheel_index(unsigned long expires, unsigned long clk)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue