From: Viresh Kumar <viresh.kumar@linaro.org>
To: tglx@linutronix.de
Cc: linaro-kernel@lists.linaro.org, linaro-networking@linaro.org,
linux-kernel@vger.kernel.org, fweisbec@gmail.com,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V2 08/19] tick-oneshot: move tick_is_oneshot_available() to tick-oneshot.c
Date: Mon, 21 Apr 2014 15:25:04 +0530 [thread overview]
Message-ID: <ccb0dc853c0c2fdf5fc87e852c11e4f4f7976fc7.1398072824.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1398072824.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1398072824.git.viresh.kumar@linaro.org>
This is tick-oneshot specific routine and hence must be defined in
tick-oneshot.c.
Also, as it isn't used outside kernel/time/, move its declaration to
tick-internal.h.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
include/linux/tick.h | 1 -
kernel/time/tick-common.c | 14 --------------
kernel/time/tick-internal.h | 2 ++
kernel/time/tick-oneshot.c | 14 ++++++++++++++
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 98065e5..b8ee6f4 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -84,7 +84,6 @@ struct tick_sched {
};
extern void __init tick_init(void);
-extern int tick_is_oneshot_available(void);
DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
static inline struct tick_device *tick_get_device(int cpu)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 4d45e08..64897d3 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -53,20 +53,6 @@ int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
/*
* Debugging: see timer_list.c
*/
-/**
- * tick_is_oneshot_available - check for a oneshot capable event device
- */
-int tick_is_oneshot_available(void)
-{
- struct clock_event_device *dev = tick_get_cpu_device()->evtdev;
-
- if (!dev || !(dev->features & CLOCK_EVT_FEAT_ONESHOT))
- return 0;
- if (!(dev->features & CLOCK_EVT_FEAT_C3STOP))
- return 1;
- return tick_broadcast_oneshot_available();
-}
-
/*
* Periodic tick
*/
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index 57c1a76..09f4307 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -42,6 +42,7 @@ extern void tick_setup_oneshot(struct clock_event_device *newdev,
extern int tick_program_event(ktime_t expires, int force);
extern void tick_oneshot_notify(void);
extern int tick_switch_to_oneshot(void (*handler)(struct clock_event_device *));
+extern int tick_is_oneshot_available(void);
extern void tick_resume_oneshot(void);
# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
extern void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
@@ -96,6 +97,7 @@ static inline int tick_resume_broadcast_oneshot(struct clock_event_device *bc)
return 0;
}
static inline int tick_broadcast_oneshot_active(void) { return 0; }
+static inline int tick_is_oneshot_available(void) { return 0; };
static inline bool tick_broadcast_oneshot_available(void) { return false; }
#endif /* !TICK_ONESHOT */
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 7089dea..aaf60a9 100644
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -102,6 +102,20 @@ int tick_oneshot_mode_active(void)
return ret;
}
+/**
+ * tick_is_oneshot_available - check for a oneshot capable event device
+ */
+int tick_is_oneshot_available(void)
+{
+ struct clock_event_device *dev = tick_get_cpu_device()->evtdev;
+
+ if (!dev || !(dev->features & CLOCK_EVT_FEAT_ONESHOT))
+ return 0;
+ if (!(dev->features & CLOCK_EVT_FEAT_C3STOP))
+ return 1;
+ return tick_broadcast_oneshot_available();
+}
+
#ifdef CONFIG_HIGH_RES_TIMERS
/**
* tick_init_highres - switch to high resolution mode
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2014-04-21 10:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 9:54 [PATCH V2 00/19] tick: cleanups (Shouldn't change code behavior) Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 01/19] tick: trivial cleanups Viresh Kumar
2014-04-22 21:23 ` Frederic Weisbecker
2014-04-23 4:49 ` Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 02/19] tick: update doc style comments for 'struct tick_sched' Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 03/19] tick: rearrange members of " Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 04/19] tick: move declaration of 'tick_cpu_device' to tick.h Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 05/19] tick: move definition of tick_get_device() " Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 06/19] tick: create tick_get_cpu_device() to get tick_cpu_device on this cpu Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 07/19] tick: initialize variables during their definitions Viresh Kumar
2014-04-21 9:55 ` Viresh Kumar [this message]
2014-04-21 9:55 ` [PATCH V2 09/19] tick-oneshot: remove tick_resume_oneshot() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 10/19] tick-common: call tick_check_percpu() from tick_check_preferred() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 11/19] tick-common: remove tick_check_replacement() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 12/19] tick-common: don't pass 'cpu' & 'cpumask' to tick_setup_device() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 13/19] tick-common: remove local variable 'broadcast' from tick_resume() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 14/19] tick-sched: add comment about 'idle_active' in tick_nohz_idle_exit() Viresh Kumar
2014-04-21 23:20 ` Frederic Weisbecker
2014-04-22 4:05 ` viresh kumar
2014-04-21 9:55 ` [PATCH V2 15/19] tick-sched: define 'delta' inside 'if' block in update_ts_time_stats() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 16/19] tick-sched: remove parameters to {__}tick_nohz_task_switch() routines Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 17/19] tick-sched: remove local variable 'now' from tick_setup_sched_timer() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 18/19] tick-sched: invert parameter of tick_check_oneshot_change() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 19/19] tick-sched: rearrange code in tick_do_update_jiffies64() Viresh Kumar
2014-04-30 8:51 ` [PATCH V2 00/19] tick: cleanups (Shouldn't change code behavior) Viresh Kumar
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=ccb0dc853c0c2fdf5fc87e852c11e4f4f7976fc7.1398072824.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=fweisbec@gmail.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linaro-networking@linaro.org \
--cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).