From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Anton Vorontsov <anton@enomsg.org>,
Alexey Perevalov <a.perevalov@samsung.com>,
kyungmin.park@samsung.com, cw00.choi@samsung.com
Subject: [RFC patch 1/5] hrtimer: Always check for HRTIMER_MODE_REL
Date: Fri, 21 Feb 2014 17:56:15 -0000 [thread overview]
Message-ID: <20140221174639.461201411@linutronix.de> (raw)
In-Reply-To: 20140221173936.583477951@linutronix.de
[-- Attachment #1: hrtimer-check-for-not-relative.patch --]
[-- Type: text/plain, Size: 1030 bytes --]
We have not just HRTIMER_MODE_REL and HRTIMER_MODE_ABS, so a direct
check for mode == HRTIMER_MODE_ABS is not sufficient.
Always check for the HRTIMER_MODE_REL bit.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/hrtimer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: tip/kernel/hrtimer.c
===================================================================
--- tip.orig/kernel/hrtimer.c
+++ tip/kernel/hrtimer.c
@@ -1186,7 +1186,7 @@ static void __hrtimer_init(struct hrtime
cpu_base = &__raw_get_cpu_var(hrtimer_bases);
- if (clock_id == CLOCK_REALTIME && mode != HRTIMER_MODE_ABS)
+ if (clock_id == CLOCK_REALTIME && (mode & HRTIMER_MODE_REL))
clock_id = CLOCK_MONOTONIC;
base = hrtimer_clockid_to_base(clock_id);
@@ -1620,7 +1620,7 @@ long hrtimer_nanosleep(struct timespec *
goto out;
/* Absolute timers do not update the rmtp value and restart: */
- if (mode == HRTIMER_MODE_ABS) {
+ if (!(mode & HRTIMER_MODE_REL)) {
ret = -ERESTARTNOHAND;
goto out;
}
next prev parent reply other threads:[~2014-02-21 17:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 17:56 [RFC patch 0/5] hrtimers: Add deferrable mode Thomas Gleixner
2014-02-21 17:56 ` Thomas Gleixner [this message]
2014-02-25 11:56 ` [RFC patch 1/5] hrtimer: Always check for HRTIMER_MODE_REL Peter Zijlstra
2014-02-21 17:56 ` [RFC patch 3/5] hrtimer: Add support for deferrable hrtimers Thomas Gleixner
2014-02-21 17:56 ` [RFC patch 2/5] hrtimer: Make use of the active bases bitfield Thomas Gleixner
2014-02-25 12:01 ` Peter Zijlstra
2014-02-21 17:56 ` [RFC patch 4/5] posix-timers: Expose deferrable mode to user space Thomas Gleixner
2014-02-21 17:56 ` [RFC patch 5/5] timerfd: " Thomas Gleixner
2014-02-25 8:36 ` Richard Cochran
2014-02-26 3:02 ` [RFC patch 0/5] hrtimers: Add deferrable mode Andy Lutomirski
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=20140221174639.461201411@linutronix.de \
--to=tglx@linutronix.de \
--cc=a.perevalov@samsung.com \
--cc=anton@enomsg.org \
--cc=cw00.choi@samsung.com \
--cc=john.stultz@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.