From: Bart Van Assche <bart.vanassche@gmail.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Arjan van de Ven <arjan@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] timer: Fix jiffies wrap behavior of round_jiffies*()
Date: Tue, 21 May 2013 20:43:50 +0200 [thread overview]
Message-ID: <519BC066.5080600@acm.org> (raw)
Make sure that the round_jiffies*() functions return a time that is
in the future when the jiffies counter is about to wrap.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/timer.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/timer.c b/kernel/timer.c
index 15ffdb3..aa8b964 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -149,9 +149,7 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,
/* now that we have rounded, subtract the extra skew again */
j -= cpu * 3;
- if (j <= jiffies) /* rounding ate our timeout entirely; */
- return original;
- return j;
+ return time_is_after_jiffies(j) ? j : original;
}
/**
--
1.7.10.4
next reply other threads:[~2013-05-21 18:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-21 18:43 Bart Van Assche [this message]
2013-05-29 23:01 ` Andrew Morton
2013-05-29 23:17 ` Joe Perches
2013-05-29 23:38 ` Andrew Morton
2013-05-29 23:48 ` Joe Perches
2013-05-30 0:13 ` Joe Perches
2013-05-30 4:50 ` Andrew Morton
2013-05-30 6:19 ` Bart Van Assche
2013-06-28 15:12 ` [tip:timers/core] timer: Fix jiffies wrap behavior of round_jiffies_common() tip-bot for Bart Van Assche
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=519BC066.5080600@acm.org \
--to=bart.vanassche@gmail.com \
--cc=arjan@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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®