Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit c2ae24cfd1969a28e76641807026a3bbc11c5f31

Authored by Anton Blanchard
Committed by Linus Torvalds
1 parent 56e61a9c5f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

drivers/edac/edac_device.c
Diff comments   View file @ c2ae24c
... ... @@ -440,7 +440,7 @@
440 440 */
441 441 if (edac_dev->poll_msec == 1000)
442 442 queue_delayed_work(edac_workqueue, &edac_dev->work,
443   - round_jiffies(edac_dev->delay));
  443 + round_jiffies_relative(edac_dev->delay));
444 444 else
445 445 queue_delayed_work(edac_workqueue, &edac_dev->work,
446 446 edac_dev->delay);
... ... @@ -472,7 +472,7 @@
472 472 */
473 473 if (edac_dev->poll_msec == 1000)
474 474 queue_delayed_work(edac_workqueue, &edac_dev->work,
475   - round_jiffies(edac_dev->delay));
  475 + round_jiffies_relative(edac_dev->delay));
476 476 else
477 477 queue_delayed_work(edac_workqueue, &edac_dev->work,
478 478 edac_dev->delay);
drivers/edac/edac_pci.c
Diff comments   View file @ c2ae24c
... ... @@ -246,7 +246,7 @@
246 246 /* if we are on a one second period, then use round */
247 247 msec = edac_pci_get_poll_msec();
248 248 if (msec == 1000)
249   - delay = round_jiffies(msecs_to_jiffies(msec));
  249 + delay = round_jiffies_relative(msecs_to_jiffies(msec));
250 250 else
251 251 delay = msecs_to_jiffies(msec);
252 252