From dad9cb56e1c930995ea1812b64ca2cc012fe7008 Mon Sep 17 00:00:00 2001
From: Guillaume Knispel <gknispel@proformatique.com>
Date: Tue, 17 Mar 2009 16:18:42 +0100
Subject: [PATCH] --- yaml --- r: 140507 b: refs/heads/master c:
 f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 h: refs/heads/master i:   140505:
 dfeca72106f9996997e53650eac3af40e9eab532   140503:
 34631689843eb8b96961cc7d7cc77d54cedce69a v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 87556a65c59f..f4f2030ec968 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47239561e39bceefecc3cd67f71fcf86a198a8ff
+refs/heads/master: f2d28a2ebcb525a6ec7e2152106ddb385ef52b73
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index e3602d0755b0..2be719908d1f 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1292,8 +1292,11 @@ EXPORT_SYMBOL(printk_ratelimit);
 bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 			unsigned int interval_msecs)
 {
-	if (*caller_jiffies == 0 || time_after(jiffies, *caller_jiffies)) {
-		*caller_jiffies = jiffies + msecs_to_jiffies(interval_msecs);
+	if (*caller_jiffies == 0
+			|| !time_in_range(jiffies, *caller_jiffies,
+					*caller_jiffies
+					+ msecs_to_jiffies(interval_msecs))) {
+		*caller_jiffies = jiffies;
 		return true;
 	}
 	return false;