Re: [GIT pull] timer updates for 5.0

2019-01-27 Thread pr-tracker-bot
The pull request you sent on Sun, 27 Jan 2019 12:05:07 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
> timers-urgent-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f907bb4c326d145c13504db184f38557d169f4bc

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker


[GIT pull] timer updates for 5.0

2019-01-27 Thread Thomas Gleixner
Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
timers-urgent-for-linus

A single regression fix to address the unintended breakage of posix cpu
timers. This is caused by a new sanity check in the common code, which
fails for posix cpu timers under certain conditions because the posix cpu
timer code never updates the variable which is checked.

Thanks,

tglx

-->
Thomas Gleixner (1):
  posix-cpu-timers: Unbreak timer rearming


 kernel/time/posix-cpu-timers.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 8f0644af40be..80f955210861 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int 
timer_flags,
 * set up the signal and overrun bookkeeping.
 */
timer->it.cpu.incr = timespec64_to_ns(>it_interval);
+   timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
 
/*
 * This acts as a modification timestamp for the timer,



[GIT pull] timer updates for 5.0

2019-01-27 Thread Thomas Gleixner
Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
timers-urgent-for-linus

A single regression fix to address the unintended breakage of posix cpu
timers. This is caused by a new sanity check in the common code, which
fails for posix cpu timers under certain conditions because the posix cpu
timer code never updates the variable which is checked.

Thanks,

tglx

-->
Thomas Gleixner (1):
  posix-cpu-timers: Unbreak timer rearming


 kernel/time/posix-cpu-timers.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 8f0644af40be..80f955210861 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int 
timer_flags,
 * set up the signal and overrun bookkeeping.
 */
timer->it.cpu.incr = timespec64_to_ns(>it_interval);
+   timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
 
/*
 * This acts as a modification timestamp for the timer,