The patch titled serial: use time_before, time_before_eq, etc has been added to the -mm tree. Its filename is serial-use-time_before-time_before_eq-etc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: use time_before, time_before_eq, etc From: Julia Lawall <julia@xxxxxxx> The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. A simplified version of the semantic patch making this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ change_compare_np @ expression E; @@ ( - jiffies <= E + time_before_eq(jiffies,E) | - jiffies >= E + time_after_eq(jiffies,E) | - jiffies < E + time_before(jiffies,E) | - jiffies > E + time_after(jiffies,E) ) @ include depends on change_compare_np @ @@ #include <linux/jiffies.h> @ no_include depends on !include && change_compare_np @ @@ #include <linux/...> + #include <linux/jiffies.h> // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/68360serial.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/serial/68360serial.c~serial-use-time_before-time_before_eq-etc drivers/serial/68360serial.c --- a/drivers/serial/68360serial.c~serial-use-time_before-time_before_eq-etc +++ a/drivers/serial/68360serial.c @@ -51,6 +51,7 @@ extern int kgdb_output_string (const ch /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */ #include <linux/console.h> +#include <linux/jiffies.h> /* this defines the index into rs_table for the port to use */ @@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struc msleep_interruptible(jiffies_to_msecs(char_time)); if (signal_pending(current)) break; - if (timeout && ((orig_jiffies + timeout) < jiffies)) + if (timeout && (time_after(jiffies, orig_jiffies + timeout))) break; /* The 'tx_cur' is really the next buffer to send. We * have to back up to the previous BD and wait for it _ Patches currently in -mm which might be from julia@xxxxxxx are git-alsa-tiwai.patch git-powerpc.patch drivers-media-video-use-time_before-time_before_eq-etc.patch git-gfs2-nmw.patch git-infiniband.patch drivers-char-keyboardc-use-time_before-time_before_eq-etc.patch git-udf.patch git-net.patch drivers-atm-use-time_before-time_before_eq-etc.patch drivers-net-appletalk-use-time_before-time_before_eq-etc.patch git-ocfs2.patch drivers-scsi-use-time_before-time_before_eq-etc.patch fs-affs-filec-use-bug_on.patch drivers-misc-elide-a-non-zero-test-on-a-result-that-is-never-0.patch serial-use-time_before-time_before_eq-etc.patch drivers-char-rtcc-use-time_before-time_before_eq-etc.patch fbdev-use-div_round_up-or-roundup.patch drivers-md-use-time_before-time_before_eq-etc.patch drivers-md-use-time_before-time_before_eq-etc-checkpatch-fixes.patch fs-ext2-use-bug_on.patch fs-ext3-use-bug_on.patch fs-ext4-use-bug_on.patch drivers-char-ds1286c-use-time_before-time_before_eq-etc.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