]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
posix-timers: Fix inverted SIGEV_NONE logic in common_timer_get()
authorThomas Gleixner <tglx@linutronix.de>
Mon, 12 Jun 2017 15:21:26 +0000 (17:21 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 12 Jun 2017 15:29:07 +0000 (17:29 +0200)
The refactoring of the posix-timer core to allow better code sharing
introduced inverted logic vs. SIGEV_NONE timers in common_timer_get().

That causes hrtimer_forward() to be called on active timers, which
rightfully triggers the warning hrtimer_forward().

Make sig_none what it says: signal mode == SIGEV_NONE.

Fixes: 91d57bae0868 ("posix-timers: Make use of forward/remaining callbacks")
Reported-by: Ye Xiaolong <xiaolong.ye@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20170609104457.GA39907@inn.lkp.intel.com
kernel/time/posix-timers.c

index 6e7a70b1bf37d64dd6f6e5b23d8c767dc2e8225c..b53a0b5625161327aaf7bff9e06c88ea2521d436 100644 (file)
@@ -644,7 +644,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
        struct timespec64 ts64;
        bool sig_none;
 
-       sig_none = (timr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE;
+       sig_none = (timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE;
        iv = timr->it_interval;
 
        /* interval timer ? */