diff options
| author | Anton Blanchard <anton@samba.org> | 2008-02-07 00:14:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 08:42:23 -0800 |
| commit | c2ae24cfd1969a28e76641807026a3bbc11c5f31 (patch) | |
| tree | 4a78a505f8b61a2f404c335b59b6a4af31c51e9d /drivers/edac | |
| parent | 56e61a9c5fe7b799504b125c278b56cc2c42670f (diff) | |
| download | kernel_samsung_aries-c2ae24cfd1969a28e76641807026a3bbc11c5f31.zip kernel_samsung_aries-c2ae24cfd1969a28e76641807026a3bbc11c5f31.tar.gz kernel_samsung_aries-c2ae24cfd1969a28e76641807026a3bbc11c5f31.tar.bz2 | |
drivers-edac: use round_jiffies_relative
When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/edac_device.c | 4 | ||||
| -rw-r--r-- | drivers/edac/edac_pci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 55d14d0..b9552bc 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -440,7 +440,7 @@ static void edac_device_workq_function(struct work_struct *work_req) */ if (edac_dev->poll_msec == 1000) queue_delayed_work(edac_workqueue, &edac_dev->work, - round_jiffies(edac_dev->delay)); + round_jiffies_relative(edac_dev->delay)); else queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay); @@ -472,7 +472,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, */ if (edac_dev->poll_msec == 1000) queue_delayed_work(edac_workqueue, &edac_dev->work, - round_jiffies(edac_dev->delay)); + round_jiffies_relative(edac_dev->delay)); else queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay); diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index e0b47b7..32be435 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c @@ -246,7 +246,7 @@ static void edac_pci_workq_function(struct work_struct *work_req) /* if we are on a one second period, then use round */ msec = edac_pci_get_poll_msec(); if (msec == 1000) - delay = round_jiffies(msecs_to_jiffies(msec)); + delay = round_jiffies_relative(msecs_to_jiffies(msec)); else delay = msecs_to_jiffies(msec); |