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 <[email protected]>
---
Found with visual inspection.
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 e52b427223ba..327658ac892d 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -277,8 +277,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
@@ -301,8 +299,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 8e11d8d9f419..36cae2bec264 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1366,10 +1366,7 @@ void hrtimer_interrupt(struct clock_event_device *dev)
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;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
This function isn't used outside of tick-broadcast.c, so let's
mark it static.
Signed-off-by: Stephen Boyd <[email protected]>
---
Found with visual inspection.
kernel/time/tick-broadcast.c | 4 +++-
kernel/time/tick-internal.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 987e496bb51a..1f534ddb07ab 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -152,6 +152,8 @@ static void tick_device_setup_broadcast_func(struct clock_event_device *dev)
}
}
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
+
/*
* Check, if the device is disfunctional and a place holder, which
* needs to be handled by the broadcast device.
@@ -867,7 +869,7 @@ static void tick_broadcast_init_next_event(struct cpumask *mask,
/**
* tick_broadcast_setup_oneshot - setup the broadcast device
*/
-void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
int cpu = smp_processor_id();
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index f738251000fe..be0ac01f2e12 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -126,7 +126,6 @@ static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
/* Functions related to oneshot broadcasting */
#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
-extern void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
extern void tick_broadcast_switch_to_oneshot(void);
extern void tick_shutdown_broadcast_oneshot(unsigned int cpu);
extern int tick_broadcast_oneshot_active(void);
@@ -134,7 +133,6 @@ extern void tick_check_oneshot_broadcast_this_cpu(void);
bool tick_broadcast_oneshot_available(void);
extern struct cpumask *tick_get_broadcast_oneshot_mask(void);
#else /* !(BROADCAST && ONESHOT): */
-static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) { BUG(); }
static inline void tick_broadcast_switch_to_oneshot(void) { }
static inline void tick_shutdown_broadcast_oneshot(unsigned int cpu) { }
static inline int tick_broadcast_oneshot_active(void) { return 0; }
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
On Fri, 17 Mar 2017, tip-bot for Stephen Boyd wrote:
> Commit-ID: f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
> Gitweb: http://git.kernel.org/tip/f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
> Author: Stephen Boyd <[email protected]>
> AuthorDate: Thu, 16 Mar 2017 18:08:14 -0700
> Committer: Thomas Gleixner <[email protected]>
> CommitDate: Fri, 17 Mar 2017 18:24:59 +0100
>
> tick/broadcast: Make tick_broadcast_setup_oneshot() static
Zapped it due to 0-day failure
Commit-ID: 016da20148a1692e34d35d1f1787400a2a2d2c58
Gitweb: http://git.kernel.org/tip/016da20148a1692e34d35d1f1787400a2a2d2c58
Author: Stephen Boyd <[email protected]>
AuthorDate: Thu, 16 Mar 2017 18:08:13 -0700
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
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;
Commit-ID: f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
Gitweb: http://git.kernel.org/tip/f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
Author: Stephen Boyd <[email protected]>
AuthorDate: Thu, 16 Mar 2017 18:08:14 -0700
Committer: Thomas Gleixner <[email protected]>
CommitDate: Fri, 17 Mar 2017 18:24:59 +0100
tick/broadcast: Make tick_broadcast_setup_oneshot() static
This function isn't used outside of tick-broadcast.c, so make it static.
Signed-off-by: Stephen Boyd <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
kernel/time/tick-broadcast.c | 4 +++-
kernel/time/tick-internal.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 987e496..1f534dd 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -152,6 +152,8 @@ static void tick_device_setup_broadcast_func(struct clock_event_device *dev)
}
}
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
+
/*
* Check, if the device is disfunctional and a place holder, which
* needs to be handled by the broadcast device.
@@ -867,7 +869,7 @@ static void tick_broadcast_init_next_event(struct cpumask *mask,
/**
* tick_broadcast_setup_oneshot - setup the broadcast device
*/
-void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
int cpu = smp_processor_id();
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index f738251..be0ac01 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -126,7 +126,6 @@ static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
/* Functions related to oneshot broadcasting */
#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
-extern void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
extern void tick_broadcast_switch_to_oneshot(void);
extern void tick_shutdown_broadcast_oneshot(unsigned int cpu);
extern int tick_broadcast_oneshot_active(void);
@@ -134,7 +133,6 @@ extern void tick_check_oneshot_broadcast_this_cpu(void);
bool tick_broadcast_oneshot_available(void);
extern struct cpumask *tick_get_broadcast_oneshot_mask(void);
#else /* !(BROADCAST && ONESHOT): */
-static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) { BUG(); }
static inline void tick_broadcast_switch_to_oneshot(void) { }
static inline void tick_shutdown_broadcast_oneshot(unsigned int cpu) { }
static inline int tick_broadcast_oneshot_active(void) { return 0; }
On 03/17, Thomas Gleixner wrote:
> On Fri, 17 Mar 2017, tip-bot for Stephen Boyd wrote:
>
> > Commit-ID: f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
> > Gitweb: http://git.kernel.org/tip/f5e38e7c86427bd7c01b259a9655cb6a9aba5cb7
> > Author: Stephen Boyd <[email protected]>
> > AuthorDate: Thu, 16 Mar 2017 18:08:14 -0700
> > Committer: Thomas Gleixner <[email protected]>
> > CommitDate: Fri, 17 Mar 2017 18:24:59 +0100
> >
> > tick/broadcast: Make tick_broadcast_setup_oneshot() static
>
> Zapped it due to 0-day failure
Urgh, I forgot to test all possible combinations. Sorry. I'll fix
it and resend.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project