From: Viresh Kumar <viresh.kumar@linaro.org>
To: tglx@linutronix.de
Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org,
fweisbec@gmail.com, linaro-networking@linaro.org,
Arvind.Chauhan@arm.com, Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH 02/16] hrtimer: reorder code in __remove_hrtimer()
Date: Fri, 28 Mar 2014 17:11:21 +0530 [thread overview]
Message-ID: <9ea86197955aee2b751ccb5a8ea746dbd3244850.1396006658.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1396006658.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1396006658.git.viresh.kumar@linaro.org>
This patch reorders code within __remove_hrtimer() routine to achieve this:
- no need to check if timer is the next timer to expire when high resolution
mode isn't configured in kernel.
- no need of local variable 'next_timer'
- Validate 'reprogram' and hrtimer_hres_active() first as without these we don't
need to check if timer is the next timer to fire.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
kernel/hrtimer.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index a710638..6476152 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -887,25 +887,22 @@ static void __remove_hrtimer(struct hrtimer *timer,
struct hrtimer_clock_base *base,
unsigned long newstate, int reprogram)
{
- struct timerqueue_node *next_timer;
if (!(timer->state & HRTIMER_STATE_ENQUEUED))
goto out;
- next_timer = timerqueue_getnext(&base->active);
timerqueue_del(&base->active, &timer->node);
- if (&timer->node == next_timer) {
+
#ifdef CONFIG_HIGH_RES_TIMERS
- /* Reprogram the clock event device. if enabled */
- if (reprogram && hrtimer_hres_active()) {
- ktime_t expires;
-
- expires = ktime_sub(hrtimer_get_expires(timer),
- base->offset);
- if (base->cpu_base->expires_next.tv64 == expires.tv64)
- hrtimer_force_reprogram(base->cpu_base, 1);
- }
-#endif
+ /* Reprogram the clock event device. if enabled */
+ if (reprogram && hrtimer_hres_active() &&
+ &timer->node == timerqueue_getnext(&base->active)) {
+ ktime_t expires;
+
+ expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+ if (base->cpu_base->expires_next.tv64 == expires.tv64)
+ hrtimer_force_reprogram(base->cpu_base, 1);
}
+#endif
if (!timerqueue_getnext(&base->active))
base->cpu_base->active_bases &= ~(1 << base->index);
out:
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2014-03-28 11:42 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-28 11:41 [PATCH 00/16] timers/hrtimers: Minor cleanups: Part II Viresh Kumar
2014-03-28 11:41 ` [PATCH 01/16] hrtimer: move unlock_hrtimer_base() upwards Viresh Kumar
2014-03-28 11:41 ` Viresh Kumar [this message]
2014-04-02 5:41 ` [PATCH 02/16] hrtimer: reorder code in __remove_hrtimer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 03/16] hrtimer: Create hrtimer_get_monoexpires() Viresh Kumar
2014-03-28 11:41 ` [PATCH 04/16] hrtimer: remove 'base' parameter from remove_timer() and __remove_timer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 05/16] hrtimer: remove 'base' parameter from switch_hrtimer_base() Viresh Kumar
2014-03-28 11:41 ` [PATCH 06/16] hrtimer: remove 'base' parameter from enqueue_hrtimer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 07/16] hrtimer: remove 'base' parameter from hrtimer_{enqueue_}reprogram() Viresh Kumar
2014-03-28 11:41 ` [PATCH 08/16] hrtimer: make switch_hrtimer_base() return void Viresh Kumar
2014-03-28 11:41 ` [PATCH 09/16] hrtimer: make lock_hrtimer_base() " Viresh Kumar
2014-03-28 11:41 ` [PATCH 10/16] hrtimer: make enqueue_hrtimer() " Viresh Kumar
2014-03-28 11:41 ` [PATCH 11/16] hrtimer: don't check if timer is queued in __remove_hrtimer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 12/16] hrtimer: rewrite switch_hrtimer_base() to remove extra indentation level Viresh Kumar
2014-03-28 11:41 ` [PATCH 13/16] hrtimer: rewrite remove_hrtimer() " Viresh Kumar
2014-03-28 11:41 ` [PATCH 14/16] hrtimer: replace base by new_base to get resolution: __hrtimer_start_range_ns() Viresh Kumar
2014-03-28 11:41 ` [PATCH 15/16] hrtimer: create base_on_this_cpu() Viresh Kumar
2014-03-28 11:41 ` [PATCH 16/16] hrtimer: use base->hres_active directly instead of hrtimer_hres_active() Viresh Kumar
2014-03-28 12:24 ` Viresh Kumar
2014-03-28 12:26 ` [PATCH V2 " Viresh Kumar
2014-03-31 13:38 ` [PATCH 00/16] timers/hrtimers: Minor cleanups: Part II Thomas Gleixner
2014-03-31 14:31 ` Viresh Kumar
2014-03-31 15:51 ` Thomas Gleixner
2014-04-01 6:33 ` Viresh Kumar
2014-04-01 7:02 ` 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=9ea86197955aee2b751ccb5a8ea746dbd3244850.1396006658.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=Arvind.Chauhan@arm.com \
--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
all inboxes | Powered by JetHome®