[patch 4/6] char/shwdt remove duplicate msecs_to_jiffies()

From: maximilian attems (janitor_at_sternwelten.at)
Date: 10/31/04

  • Next message: maximilian attems: "[patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies()"
    Date:	Sun, 31 Oct 2004 15:45:03 +0100
    To: Jeff Garzik <jgarzik@pobox.com>
    
    

    remove duplicate msecs_to_jiffies() definition.
    add include <delay.h>.

    Signed-off-by: Maximilian Attems <janitor@sternwelten.at>

    ---
     linux-2.4.28-rc1-max/drivers/char/shwdt.c |    2 +-
     1 files changed, 1 insertion(+), 1 deletion(-)
    diff -puN drivers/char/shwdt.c~remove-msecs_to_jiffies-drivers_char_shwdt drivers/char/shwdt.c
    --- linux-2.4.28-rc1/drivers/char/shwdt.c~remove-msecs_to_jiffies-drivers_char_shwdt	2004-10-31 13:40:49.000000000 +0100
    +++ linux-2.4.28-rc1-max/drivers/char/shwdt.c	2004-10-31 13:42:05.000000000 +0100
    @@ -27,6 +27,7 @@
     #include <linux/reboot.h>
     #include <linux/notifier.h>
     #include <linux/ioport.h>
    +#include <linux/delay.h>
     
     #include <asm/io.h>
     #include <asm/uaccess.h>
    @@ -113,7 +114,6 @@
      */
     static int clock_division_ratio = WTCSR_CKS_4096;
     
    -#define msecs_to_jiffies(msecs)	(jiffies + (HZ * msecs + 9999) / 10000)
     #define next_ping_period(cks)	msecs_to_jiffies(cks - 4)
     
     static unsigned long shwdt_is_open;
    _
    -
    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/
    

  • Next message: maximilian attems: "[patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies()"

    Relevant Pages

    • Re: Fwd: Registration Weakness in Linux Kernels Binary formats
      ... Subject: Registration Weakness in Linux Kernel's Binary formats To: ... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ - To unsubscribe ...
      (Linux-Kernel)
    • Re: [2.6.16rc2] compile error
      ... To unsubscribe from this list: ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ... Copyright 2006 by Maurice Eugene Heskett, ...
      (Linux-Kernel)
    • Re: your unsubscribe request
      ... To unsubscribe immediately, ... send the line "unsubscribe linux-kernel" in ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
      (Linux-Kernel)
    • RE: 2.6.0-test4-mm5
      ... > To unsubscribe from this list: ... > More majordomo info at http://vger.kernel.org/majordomo-info.html ... > Please read the FAQ at http://www.tux.org/lkml/ ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Administrivia: FAQ etc.
      ... Subject: Administrivia: FAQ etc. ... It contains information such as how to unsubscribe from the list and what ... Out of Office Autoreplies ... frustrating when you post to the list and get 50 out of office messages ...
      (Focus-Microsoft)