summaryrefslogtreecommitdiffstats
path: root/kernel/time/timer.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <frederic@kernel.org>2020-07-17 16:05:41 +0200
committerThomas Gleixner <tglx@linutronix.de>2020-07-17 21:55:21 +0200
commit3d2e83a2a6a0657c1cf145fa6ba23620715d6c36 (patch)
treec6bafe07e103f73b9c092915ee0e4285110646b1 /kernel/time/timer.c
parenttimer: Fix wheel index calculation on last level (diff)
downloadlinux-3d2e83a2a6a0657c1cf145fa6ba23620715d6c36.tar.xz
linux-3d2e83a2a6a0657c1cf145fa6ba23620715d6c36.zip
timers: Preserve higher bits of expiration on index calculation
The higher bits of the timer expiration are cropped while calling calc_index() due to the implicit cast from unsigned long to unsigned int. This loss shouldn't have consequences on the current code since all the computation to calculate the index is done on the lower 32 bits. However to prepare for returning the actual bucket expiration from calc_index() in order to properly fix base->next_expiry updates, the higher bits need to be preserved. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200717140551.29076-3-frederic@kernel.org
Diffstat (limited to 'kernel/time/timer.c')
-rw-r--r--kernel/time/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index df1ff803acc4..bcdc3045138d 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -487,7 +487,7 @@ 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.
*/
-static inline unsigned calc_index(unsigned expires, unsigned lvl)
+static inline unsigned calc_index(unsigned long expires, unsigned lvl)
{
expires = (expires + LVL_GRAN(lvl)) >> LVL_SHIFT(lvl);
return LVL_OFFS(lvl) + (expires & LVL_MASK);