From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753172AbdLMN6o (ORCPT ); Wed, 13 Dec 2017 08:58:44 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:35653 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbdLMN6i (ORCPT ); Wed, 13 Dec 2017 08:58:38 -0500 Date: Wed, 13 Dec 2017 14:58:35 +0100 From: Sebastian Andrzej Siewior To: linux-rt-users@vger.kernel.org Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, Peter Zijlstra , Steven Rostedt Subject: [PATCH RT] time/hrtimer: disable that mode check Message-ID: <20171213135835.rwtcf7kj45a6x4tt@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: NeoMutt/20171208 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On -RT we push all timers by default into the soft-mode. The "start/update" code does not use that SOFT bit so we always see that warning. Signed-off-by: Sebastian Andrzej Siewior --- I am going to fold it into the original patch since only v4.14 is affected. kernel/time/hrtimer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 2fff8790bc56..f4df924d4b48 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -422,8 +422,10 @@ static inline void debug_hrtimer_activate(struct hrtimer *timer, * Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft * match, when a timer is started via__hrtimer_start_range_ns(). */ +#ifndef CONFIG_PREEMPT_RT_BASE if (modecheck) - WARN_ON_ONCE((mode & HRTIMER_MODE_SOFT) & !timer->is_soft); + WARN_ON_ONCE(!(mode & HRTIMER_MODE_SOFT) ^ !timer->is_soft); +#endif debug_object_activate(timer, &hrtimer_debug_descr); } -- 2.15.0