iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: sgi-gru: use time_before()

Browse Source 
To be future-proof and for better readability the time comparisons are
modified to use time_before() instead of plain, error-prone math.

Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Manuel Schölling 2015-09-21 15:48:17 +05:30 committed by Greg Kroah-Hartman
parent d18243293a
commit b74afe5892
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/sgi-gru/grumain.c
View File

@ -930,6 +930,7 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
struct gru_thread_state *gts; struct gru_thread_state *gts;
unsigned long paddr, vaddr; unsigned long paddr, vaddr;
unsigned long expires;
vaddr = (unsigned long)vmf->virtual_address; vaddr = (unsigned long)vmf->virtual_address;
gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n", gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
@ -954,7 +955,8 @@ again:
mutex_unlock(&gts->ts_ctxlock); mutex_unlock(&gts->ts_ctxlock);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(GRU_ASSIGN_DELAY); /* true hack ZZZ */ schedule_timeout(GRU_ASSIGN_DELAY); /* true hack ZZZ */
if (gts->ts_steal_jiffies + GRU_STEAL_DELAY < jiffies) expires = gts->ts_steal_jiffies + GRU_STEAL_DELAY;
if (time_before(expires, jiffies))
gru_steal_context(gts); gru_steal_context(gts);
goto again; goto again;
} }