From: tip-bot for Stephen Boyd <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: sboyd@codeaurora.org, hpa@zytor.com, tglx@linutronix.de,
mingo@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip:timers/core] hrtimer: Remove hrtimer_peek_ahead_timers() leftovers
Date: Fri, 17 Mar 2017 10:27:56 -0700 [thread overview]
Message-ID: <tip-016da20148a1692e34d35d1f1787400a2a2d2c58@git.kernel.org> (raw)
In-Reply-To: <20170317010814.2591-1-sboyd@codeaurora.org>
Commit-ID: 016da20148a1692e34d35d1f1787400a2a2d2c58
Gitweb: http://git.kernel.org/tip/016da20148a1692e34d35d1f1787400a2a2d2c58
Author: Stephen Boyd <sboyd@codeaurora.org>
AuthorDate: Thu, 16 Mar 2017 18:08:13 -0700
Committer: Thomas Gleixner <tglx@linutronix.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@codeaurora.org>
Link: http://lkml.kernel.org/r/20170317010814.2591-1-sboyd@codeaurora.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.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;
prev parent reply other threads:[~2017-03-17 17:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 1:08 [PATCH 1/2] hrtimer: hrtimer_peek_ahead_timers() is gone Stephen Boyd
2017-03-17 1:08 ` [PATCH 2/2] tick/broadcast: tick_broadcast_setup_oneshot() isn't exported Stephen Boyd
2017-03-17 17:28 ` [tip:timers/core] tick/broadcast: Make tick_broadcast_setup_oneshot() static tip-bot for Stephen Boyd
2017-03-17 17:43 ` Thomas Gleixner
2017-03-17 18:25 ` Stephen Boyd
2017-03-17 17:27 ` tip-bot for Stephen Boyd [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-016da20148a1692e34d35d1f1787400a2a2d2c58@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox