Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603492

[tip:timers/core] hrtimer: Remove hrtimer_peek_ahead_timers() leftovers

Show all headers | View raw

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;

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] hrtimer: hrtimer_peek_ahead_timers() is gone Stephen Boyd <sboyd@codeaurora.org> - 2017-03-17 02:10 +0100
  [PATCH 2/2] tick/broadcast: tick_broadcast_setup_oneshot() isn't exported Stephen Boyd <sboyd@codeaurora.org> - 2017-03-17 02:10 +0100
    Re: [tip:timers/core] tick/broadcast: Make tick_broadcast_setup_oneshot()  static Thomas Gleixner <tglx@linutronix.de> - 2017-03-17 18:50 +0100
      Re: [tip:timers/core] tick/broadcast: Make  tick_broadcast_setup_oneshot() static Stephen Boyd <sboyd@codeaurora.org> - 2017-03-17 19:30 +0100
    [tip:timers/core] tick/broadcast: Make  tick_broadcast_setup_oneshot() static tip-bot for Stephen Boyd <tipbot@zytor.com> - 2017-03-17 18:50 +0100
  [tip:timers/core] hrtimer: Remove hrtimer_peek_ahead_timers()  leftovers tip-bot for Stephen Boyd <tipbot@zytor.com> - 2017-03-17 18:50 +0100

csiph-web