diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-16 10:51:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-16 12:20:47 +0200 |
| commit | 6bac75c9019bef9b259f184e59726ad825fd9a3c (patch) | |
| tree | c7d0886536541ce15d0d9bdb2b29ae60076e5cf7 | |
| parent | d6f7bb5bb29096b2935c55deeb545616dab74406 (diff) | |
| download | linux-stable-6bac75c9019bef9b259f184e59726ad825fd9a3c.tar.gz | |
Revert "posix-cpu-timers: Force next expiration recalc after itimer reset"
This reverts commit 564005805aadec9cb7e5dc4e14071b8f87cd6b58 which is
commit 406dd42bd1ba0c01babf9cde169bb319e52f6147 upstream.
It is reported to cause regressions. A proposed fix has been posted,
but it is not in a released kernel yet. So just revert this from the
stable release so that the bug is fixed. If it's really needed we can
add it back in in a future release.
Link: https://lore.kernel.org/r/87ilz1pwaq.fsf@wylie.me.uk
Reported-by: "Alan J. Wylie" <alan@wylie.me.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index a002685f688d..517be7fd175e 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -1346,6 +1346,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid, } } + if (!*newval) + return; *newval += now; } |