Subject: [merged] kernel-timerc-fix-jiffies-wrap-behavior-of-round_jiffies.patch removed from -mm tree
To: bart.vanassche@xxxxxxxxx,arjan@xxxxxxxxxxxxx,bvanassche@xxxxxxx,sfr@xxxxxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 03 Jul 2013 12:32:21 -0700
The patch titled
Subject: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()
has been removed from the -mm tree. Its filename was
kernel-timerc-fix-jiffies-wrap-behavior-of-round_jiffies.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Bart Van Assche <bart.vanassche@xxxxxxxxx>
Subject: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*()
Make sure that the round_jiffies*() functions return a time that is
in the future when the jiffies counter has recently wrapped.
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/timer.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN kernel/timer.c~kernel-timerc-fix-jiffies-wrap-behavior-of-round_jiffies kernel/timer.c
--- a/kernel/timer.c~kernel-timerc-fix-jiffies-wrap-behavior-of-round_jiffies
+++ a/kernel/timer.c
@@ -149,9 +149,7 @@ static unsigned long round_jiffies_commo
/* 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;
}
/**
_
Patches currently in -mm which might be from bart.vanassche@xxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
