arch/ia64/kernel/: use time_* macros
PATCH 5/5 arch/ia64/kernel/: use time_* macros
From: S.Caglar Onur <[email protected]>
The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.
So use the time_after() & time_before() macros, defined at linux/jiffies.h, which deal with wrapping correctly
[[email protected]: coding-style fixes]
Signed-off-by S.Caglar Onur <[email protected]>
Cc "Luck, Tony" <[email protected]>
Reviewed-by KOSAKI Motohiro <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/ia64/kernel/irq_ia64.c | 2 +- arch/ia64/kernel/mca.c | 4 +++- arch/ia64/kernel/unaligned.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/ia64/kernel/irq_ia64.c renamed from arch/ia64/kernel/irq_ia64.c~arch-ia64-kernel-use-time_-macros +1 -1
@@ -472,7 +472,7 @@ ia64_handle_irq (ia64_vector vector, strstatic unsigned char count;static long last_time; -if (jiffies - last_time >5 *HZ ) +if (time_after (jiffies, last_time +5 *HZ )) count =0 ;if (++count <5 ) { last_time = jiffies;
arch/ia64/kernel/mca.c renamed from arch/ia64/kernel/mca.c~arch-ia64-kernel-use-time_-macros +3 -1
@@ -69,6 +69,7 @@* 2007-04-27 Russ Anderson <[email protected]> * Support multiple cpus going through OS_MCA in the same event. */ +#include <linux/jiffies.h> #include <linux/types.h> #include <linux/init.h> #include <linux/sched.h>
@@ -293,7 +294,8 @@ static void ia64_mlogbuf_dump_from_init(if (mlogbuf_finished)return ; -if (mlogbuf_timestamp && (mlogbuf_timestamp +30 *HZ > jiffies)) { +if (mlogbuf_timestamp && +time_before (jiffies, mlogbuf_timestamp +30 *HZ )) {printk (KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT " " and the system seems to be messed up.\n" );ia64_mlogbuf_finish (0 );
arch/ia64/kernel/unaligned.c renamed from arch/ia64/kernel/unaligned.c~arch-ia64-kernel-use-time_-macros +2 -1
@@ -13,6 +13,7 @@* 2001/08/13 Correct size of extended floats (float_fsz) from 16 to 10 bytes. * 2001/01/17 Add support emulation of unaligned kernel accesses. */ +#include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/tty.h>
@@ -1290,7 +1291,7 @@ within_logging_rate_limit (void) {static unsigned long count, last_time; -if (jiffies - last_time >5 *HZ ) +if (time_after (jiffies, last_time +5 *HZ )) count =0 ;if (count <5 ) { last_time = jiffies;
_