From: Anton Blanchard

When rounding a relative timeout we need to use round_jiffies_relative().

Signed-off-by: Anton Blanchard
Acked-by: Arjan van de Ven
CC: Alan Cox Signed-off-by: Doug Thompson
---

Index: linux-2.6.23/drivers/edac/edac_device.c
================================================== =================
--- linux-2.6.23.orig/drivers/edac/edac_device.c
+++ linux-2.6.23/drivers/edac/edac_device.c
@@ -440,7 +440,7 @@ static void edac_device_workq_function(s
*/
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
*/
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);
Index: linux-2.6.23/drivers/edac/edac_pci.c
================================================== =================
--- linux-2.6.23.orig/drivers/edac/edac_pci.c
+++ linux-2.6.23/drivers/edac/edac_pci.c
@@ -246,7 +246,7 @@ static void edac_pci_workq_function(stru
/* 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);

-
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/