lkml.org 
[lkml]   [2008]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] arch/ia64/kernel/: Use time_* macros
    Date
    The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.

    So following patch implements usage of the time_after() & time_before() macros, defined at linux/jiffies.h, which deals with wrapping correctly

    Cc: linux-ia64@vger.kernel.org
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    ---
    arch/ia64/kernel/irq_ia64.c | 2 +-
    arch/ia64/kernel/mca.c | 3 ++-
    arch/ia64/kernel/unaligned.c | 3 ++-
    3 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
    index d8be23f..5538471 100644
    --- a/arch/ia64/kernel/irq_ia64.c
    +++ b/arch/ia64/kernel/irq_ia64.c
    @@ -472,7 +472,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
    static 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;
    diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
    index 6c18221..1959eeb 100644
    --- a/arch/ia64/kernel/mca.c
    +++ b/arch/ia64/kernel/mca.c
    @@ -69,6 +69,7 @@
    * 2007-04-27 Russ Anderson <rja@sgi.com>
    * 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,7 @@ static void ia64_mlogbuf_dump_from_init(void)
    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);
    diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
    index 6903361..ff0e7c1 100644
    --- a/arch/ia64/kernel/unaligned.c
    +++ b/arch/ia64/kernel/unaligned.c
    @@ -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;
    --
    1.5.4.3
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2008-03-17 10:43    [W:0.026 / U:91.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site