[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-016da20148a1692e34d35d1f1787400a2a2d2c58@git.kernel.org>
Date: Fri, 17 Mar 2017 10:27:56 -0700
From: tip-bot for Stephen Boyd <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: sboyd@...eaurora.org, hpa@...or.com, tglx@...utronix.de,
mingo@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip:timers/core] hrtimer: Remove hrtimer_peek_ahead_timers()
leftovers
Commit-ID: 016da20148a1692e34d35d1f1787400a2a2d2c58
Gitweb: http://git.kernel.org/tip/016da20148a1692e34d35d1f1787400a2a2d2c58
Author: Stephen Boyd <sboyd@...eaurora.org>
AuthorDate: Thu, 16 Mar 2017 18:08:13 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
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 <sboyd@...eaurora.org>
Link: http://lkml.kernel.org/r/20170317010814.2591-1-sboyd@codeaurora.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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;
Powered by blists - more mailing lists