From: maximilian attems <janitor@sternwelten.at>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Margit Schubert-While <margitsw@t-online.de>,
Nishanth Aravamudan <nacc@us.ibm.com>,
hvr@gnu.org, mcgrof@studorgs.rutgers.edu,
kernel-janitors@lists.osdl.org, netdev@oss.sgi.com,
Domen Puncer <domen@coderock.org>,
linux-kernel@vger.kernel.org
Subject: [patch 4/6] char/shwdt remove duplicate msecs_to_jiffies()
Date: Sun, 31 Oct 2004 15:45:03 +0100 [thread overview]
Message-ID: <20041031144503.GE28667@stro.at> (raw)
In-Reply-To: <41841886.2080609@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;
_
next prev parent reply other threads:[~2004-10-31 14:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20040923221303.GB13244@us.ibm.com>
2004-09-23 22:55 ` [PATCH 2.6.9-rc2 17/38] net/islpci_dev: replace schedule_timeout() with msleep() Luis R. Rodriguez
2004-09-24 7:43 ` Margit Schubert-While
2004-09-24 16:34 ` [Kernel-janitors] " maximilian attems
2004-10-01 4:15 ` Jeff Garzik
2004-10-01 7:04 ` Margit Schubert-While
2004-10-01 16:55 ` [Kernel-janitors] " Greg KH
2004-10-02 9:07 ` Margit Schubert-While
2004-10-04 21:04 ` Jeff Garzik
2004-10-30 22:22 ` [KJ] [patch 2.4] back port msleep(), msleep_interruptible() maximilian attems
2004-10-30 22:41 ` Jeff Garzik
2004-10-30 22:59 ` [KJ] " Nish Aravamudan
2004-10-30 22:59 ` Nish Aravamudan
[not found] ` <29495f1d041030155953a9a776@mail.gmail.com>
2004-10-30 23:19 ` maximilian attems
2004-10-30 23:19 ` maximilian attems
2004-10-31 14:43 ` maximilian attems
2004-10-31 14:43 ` maximilian attems
2004-10-31 14:44 ` [KJ] [patch 1/6] " maximilian attems
2004-10-31 14:44 ` [patch 2/6] libata remove duplicate definition msecs_to_jiffies() maximilian attems
2004-10-31 14:44 ` [patch 3/6] sx8 remove duplicate definition msleep(), msecs_to_jiffies() maximilian attems
2004-10-31 14:45 ` maximilian attems [this message]
2004-10-31 14:45 ` [patch 5/6] sata_promise remove duplicate msleep() definition maximilian attems
2004-10-31 14:45 ` [patch 6/6] libata remove msleep_libata() maximilian attems
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041031144503.GE28667@stro.at \
--to=janitor@sternwelten.at \
--cc=domen@coderock.org \
--cc=hvr@gnu.org \
--cc=jgarzik@pobox.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=margitsw@t-online.de \
--cc=mcgrof@studorgs.rutgers.edu \
--cc=nacc@us.ibm.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).