From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbdJXIGm (ORCPT ); Tue, 24 Oct 2017 04:06:42 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52518 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdJXIGi (ORCPT ); Tue, 24 Oct 2017 04:06:38 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8819D602BC Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=psodagud@codeaurora.org From: Prasad Sodagudi To: tglx@linutronix.de, mingo@kernel.org, viresh.kumar@linaro.org Cc: linux-kernel@vger.kernel.org, psodagud@codeaurora.org Subject: [PATCH] Clockevents: Always call clockevents_program_event Date: Tue, 24 Oct 2017 01:06:28 -0700 Message-Id: <1508832388-30929-1-git-send-email-psodagud@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <664eaf79d594e82c2b3fb736f7c1a50f@codeaurora.org> References: <664eaf79d594e82c2b3fb736f7c1a50f@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently tick_program_event function is not calling clockevents_program_event when 'expires == KTIME_MAX', it is just updating clockevent state to CLOCK_EVT_STATE_ONESHOT_STOPPED. clockevents_program_event function updates clockevent device next_event by checking clockevent device state, so always call clockevents_program_event() from tick_program_event. Signed-off-by: Prasad Sodagudi --- kernel/time/tick-oneshot.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c index 6b009c2..650b071 100644 --- a/kernel/time/tick-oneshot.c +++ b/kernel/time/tick-oneshot.c @@ -28,15 +28,12 @@ int tick_program_event(ktime_t expires, int force) { struct clock_event_device *dev = __this_cpu_read(tick_cpu_device.evtdev); - if (unlikely(expires == KTIME_MAX)) { + if (expires == KTIME_MAX) { /* * We don't need the clock event device any more, stop it. */ clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT_STOPPED); - return 0; - } - - if (unlikely(clockevent_state_oneshot_stopped(dev))) { + } else if (clockevent_state_oneshot_stopped(dev)) { /* * We need the clock event again, configure it in ONESHOT mode * before using it. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project