Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751589AbdCQRnB (ORCPT ); Fri, 17 Mar 2017 13:43:01 -0400 Received: from terminus.zytor.com ([65.50.211.136]:53444 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275AbdCQRm7 (ORCPT ); Fri, 17 Mar 2017 13:42:59 -0400 Date: Fri, 17 Mar 2017 10:27:56 -0700 From: tip-bot for Stephen Boyd Message-ID: Cc: sboyd@codeaurora.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <20170317010814.2591-1-sboyd@codeaurora.org> References: <20170317010814.2591-1-sboyd@codeaurora.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Remove hrtimer_peek_ahead_timers() leftovers Git-Commit-ID: 016da20148a1692e34d35d1f1787400a2a2d2c58 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1990 Lines: 61 Commit-ID: 016da20148a1692e34d35d1f1787400a2a2d2c58 Gitweb: http://git.kernel.org/tip/016da20148a1692e34d35d1f1787400a2a2d2c58 Author: Stephen Boyd AuthorDate: Thu, 16 Mar 2017 18:08:13 -0700 Committer: Thomas Gleixner CommitDate: Fri, 17 Mar 2017 18:24:58 +0100 hrtimer: Remove hrtimer_peek_ahead_timers() leftovers This function was removed in commit c6eb3f70d448 (hrtimer: Get rid of hrtimer softirq, 2015-04-14) but the prototype wasn't ever deleted. Delete it now. Signed-off-by: Stephen Boyd Link: http://lkml.kernel.org/r/20170317010814.2591-1-sboyd@codeaurora.org Signed-off-by: Thomas Gleixner --- include/linux/hrtimer.h | 4 ---- kernel/time/hrtimer.c | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 249e579..23d58fc 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -276,8 +276,6 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) return timer->base->cpu_base->hres_active; } -extern void hrtimer_peek_ahead_timers(void); - /* * The resolution of the clocks. The resolution value is returned in * the clock_getres() system call to give application programmers an @@ -300,8 +298,6 @@ extern unsigned int hrtimer_resolution; #define hrtimer_resolution (unsigned int)LOW_RES_NSEC -static inline void hrtimer_peek_ahead_timers(void) { } - static inline int hrtimer_is_hres_active(struct hrtimer *timer) { return 0; diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index ec08f52..1ef82cd 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1368,10 +1368,7 @@ retry: ktime_to_ns(delta)); } -/* - * local version of hrtimer_peek_ahead_timers() called with interrupts - * disabled. - */ +/* called with interrupts disabled */ static inline void __hrtimer_peek_ahead_timers(void) { struct tick_device *td;