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;