---

yaml --- r: 140507 b: refs/heads/master c: f2d28a2 h: refs/heads/master i: 140505: dfeca72 140503: 3463168 v: v3
git-mirror · Mar 17, 2009 · dad9cb5 · dad9cb5
1 parent 902e790
commit dad9cb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;